GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates for vs2022

Browse Source
This commit is contained in:
Wojciech Figat
2022-12-20 18:23:20 +01:00
parent 580f4120dc
commit 2fee75517d
8 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build_android.yml vendored
View File

@@ -7,7 +7,7 @@ jobs:
game-windows:
if: ${{ false }}
name: Game (Android, Release ARM64)
runs-on: "windows-2019"
runs-on: "windows-2022"
steps:
- name: Checkout repo
uses: actions/checkout@v3

4
.github/workflows/cd.yml vendored
View File

@@ -9,7 +9,7 @@ jobs:
# Windows
package-windows-editor:
name: Editor (Windows)
runs-on: "windows-2019"
runs-on: "windows-2022"
steps:
- name: Checkout repo
uses: actions/checkout@v3
@@ -34,7 +34,7 @@ jobs:
path: Output/EditorDebugSymbols.zip
package-windows-game:
name: Game (Windows)
runs-on: "windows-2019"
runs-on: "windows-2022"
steps:
- name: Checkout repo
uses: actions/checkout@v3

2
.github/workflows/tests.yml vendored
View File

@@ -23,7 +23,7 @@ jobs:
sudo apt-get install libx11-dev libxcursor-dev libxinerama-dev build-essential gettext libtool libtool-bin libpulse-dev libasound2-dev libjack-dev portaudio19-dev
- name: Build
run: |
./GenerateProjectFiles.sh -vs2019
./GenerateProjectFiles.sh -vs2022
./Development/Scripts/Linux/CallBuildTool.sh -build -log -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxTestsTarget
./Development/Scripts/Linux/CallBuildTool.sh -build -log -arch=x64 -platform=Linux -configuration=Debug -buildtargets=FlaxEditor -BuildBindingsOnly
./Development/Scripts/Linux/CallBuildTool.sh -build -log -arch=x64 -platform=Linux -configuration=Debug -buildtargets="FlaxEngine.Tests"

4
Source/Editor/Modules/SourceCodeEditing/InBuildSourceCodeEditor.cs
View File

@@ -78,8 +78,8 @@ namespace FlaxEditor.Modules.SourceCodeEditing
switch (Type)
{
case CodeEditorTypes.VSCodeInsiders:
case CodeEditorTypes.VSCode: return "-vscode -vs2019";
case CodeEditorTypes.Rider: return "-vs2019";
case CodeEditorTypes.VSCode: return "-vscode -vs2022";
case CodeEditorTypes.Rider: return "-vs2022";
default: return null;
}
}

4
Source/Editor/Scripting/CodeEditors/RiderCodeEditor.cpp
View File

@@ -236,7 +236,7 @@ void RiderCodeEditor::OpenFile(const String& path, int32 line)
// Generate project files if solution is missing
if (!FileSystem::FileExists(_solutionPath))
{
ScriptsBuilder::GenerateProject(TEXT("-vs2019"));
ScriptsBuilder::GenerateProject(TEXT("-vs2022"));
}
// Open file
@@ -250,7 +250,7 @@ void RiderCodeEditor::OpenSolution()
// Generate project files if solution is missing
if (!FileSystem::FileExists(_solutionPath))
{
ScriptsBuilder::GenerateProject(TEXT("-vs2019"));
ScriptsBuilder::GenerateProject(TEXT("-vs2022"));
}
// Open solution

4
Source/Editor/Scripting/CodeEditors/VisualStudioCodeEditor.cpp
View File

@@ -98,7 +98,7 @@ void VisualStudioCodeEditor::OpenFile(const String& path, int32 line)
// Generate VS solution files for intellisense
if (!FileSystem::FileExists(Globals::ProjectFolder / Editor::Project->Name + TEXT(".sln")))
{
ScriptsBuilder::GenerateProject(TEXT("-vs2019"));
ScriptsBuilder::GenerateProject(TEXT("-vs2022"));
}
// Generate project files if missing
@@ -119,7 +119,7 @@ void VisualStudioCodeEditor::OpenSolution()
// Generate VS solution files for intellisense
if (!FileSystem::FileExists(Globals::ProjectFolder / Editor::Project->Name + TEXT(".sln")))
{
ScriptsBuilder::GenerateProject(TEXT("-vs2019"));
ScriptsBuilder::GenerateProject(TEXT("-vs2022"));
}
// Generate project files if solution is missing

2
Source/Tools/Flax.Build/Flax.Build.csproj
View File

@@ -5,12 +5,14 @@
<LangVersion>11.0</LangVersion>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>annotations</Nullable>
<IsPackable>false</IsPackable>
<Configurations>Debug;Release</Configurations>
<BaseOutputPath>..\..\..\Binaries\Tools</BaseOutputPath>
<OutDir>..\..\..\Binaries\Tools</OutDir>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<DefineConstants>USE_NETCORE</DefineConstants>
<DebugType>portable</DebugType>

1
Source/Tools/Flax.Build/Projects/VisualStudio/CSSDKProjectGenerator.cs
View File

@@ -89,6 +89,7 @@ namespace Flax.Build.Projects.VisualStudio
csProjectFileContent.AppendLine(" <TargetFramework>net7.0</TargetFramework>");
csProjectFileContent.AppendLine(" <ImplicitUsings>disable</ImplicitUsings>");
csProjectFileContent.AppendLine(" <Nullable>annotations</Nullable>");
csProjectFileContent.AppendLine(" <IsPackable>false</IsPackable>");
csProjectFileContent.AppendLine(" <EnableDefaultItems>false</EnableDefaultItems>");
csProjectFileContent.AppendLine(" <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>");
csProjectFileContent.AppendLine(" <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>");