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

Disable self-contained Flax.Build binaries and other build script fixes

Browse Source
This commit is contained in:
Ari Vuollet
2022-11-29 19:38:12 +02:00
parent cc7655d804
commit 55e287c890
4 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Development/Scripts/Linux/CallBuildTool.sh
View File

@@ -10,9 +10,8 @@ if [ $testfilesize -le 1000 ]; then
fi fi
# Compile the build tool. # Compile the build tool.
dotnet msbuild /nologo /verbosity:quiet "Source/Tools/Flax.Build/Flax.Build.csproj" /target:Restore /property:RestorePackagesConfig=True /p:RuntimeIdentifier=linux-x64 dotnet msbuild /nologo /verbosity:quiet "Source/Tools/Flax.Build/Flax.Build.csproj" /property:Configuration=Release /target:Restore,Clean /property:RestorePackagesConfig=True /p:RuntimeIdentifiers=linux-x64
dotnet msbuild /nologo /verbosity:quiet "Source/Tools/Flax.Build/Flax.Build.csproj" /property:Configuration=Release /property:Platform=AnyCPU /target:Clean dotnet msbuild /nologo /verbosity:quiet "Source/Tools/Flax.Build/Flax.Build.csproj" /property:Configuration=Release /target:Build /property:SelfContained=False /property:RuntimeIdentifiers=linux-x64
dotnet msbuild /nologo /verbosity:quiet "Source/Tools/Flax.Build/Flax.Build.csproj" /property:Configuration=Release /property:Platform=AnyCPU /target:Build,Publish /p:PublishDir=./Binaries/Tools /p:SelfContained=true /p:RuntimeIdentifier=linux-x64
# Run the build tool using the provided arguments. # Run the build tool using the provided arguments.
#mono --debug --debugger-agent=transport=dt_socket,server=y,address=127.0.0.1:55555 Binaries/Tools/Flax.Build.exe "$@" #mono --debug --debugger-agent=transport=dt_socket,server=y,address=127.0.0.1:55555 Binaries/Tools/Flax.Build.exe "$@"

6
Development/Scripts/Windows/CallBuildTool.bat
View File

@@ -28,11 +28,9 @@ fc /b Cache\Intermediate\Build\Flax.Build.Files.txt Cache\Intermediate\Build\Fla
if not errorlevel 1 goto SkipClean if not errorlevel 1 goto SkipClean
copy /y Cache\Intermediate\Build\Flax.Build.Files.txt Cache\Intermediate\Build\Flax.Build.PrevFiles.txt >nul copy /y Cache\Intermediate\Build\Flax.Build.Files.txt Cache\Intermediate\Build\Flax.Build.PrevFiles.txt >nul
%MSBUILD_PATH% /nologo /verbosity:quiet Source\Tools\Flax.Build\Flax.Build.csproj /target:Restore /property:RestorePackagesConfig=True %MSBUILD_PATH% /nologo /verbosity:quiet Source\Tools\Flax.Build\Flax.Build.csproj /property:Configuration=Release /target:Restore,Clean /property:RestorePackagesConfig=True /p:RuntimeIdentifiers=win-x64
%MSBUILD_PATH% /nologo /verbosity:quiet Source\Tools\Flax.Build\Flax.Build.csproj /property:Configuration=Release /property:Platform=AnyCPU /target:Clean
:SkipClean :SkipClean
%MSBUILD_PATH% /nologo /verbosity:quiet Source\Tools\Flax.Build\Flax.Build.csproj /property:Configuration=Release /property:Platform=AnyCPU /target:Build,Publish /p:PublishDir=Binaries\Tools /p:SelfContained=true /p:RuntimeIdentifier=win-x64 %MSBUILD_PATH% /nologo /verbosity:quiet Source\Tools\Flax.Build\Flax.Build.csproj /property:Configuration=Release /target:Build /property:SelfContained=False /property:RuntimeIdentifiers=win-x64
::/p:PublishSingleFile=true /p:RuntimeIdentifier=win-x64
if errorlevel 1 goto Error_CompilationFailed if errorlevel 1 goto Error_CompilationFailed
Binaries\Tools\Flax.Build.exe %* Binaries\Tools\Flax.Build.exe %*

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

@@ -5,11 +5,9 @@
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable> <Nullable>disable</Nullable>
<Configurations>Debug;Release</Configurations> <Configurations>Debug;Release</Configurations>
<Platforms>AnyCPU</Platforms>
<BaseOutputPath>..\..\..\Binaries\Tools</BaseOutputPath> <BaseOutputPath>..\..\..\Binaries\Tools</BaseOutputPath>
<OutDir>..\..\..\Binaries\Tools</OutDir> <OutDir>..\..\..\Binaries\Tools</OutDir>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization> <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
<DefineConstants>USE_NETCORE</DefineConstants> <DefineConstants>USE_NETCORE</DefineConstants>
</PropertyGroup> </PropertyGroup>
@@ -27,13 +25,13 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="DotNetZip" Version="1.16.0"/> <PackageReference Include="DotNetZip" Version="1.16"/>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0-2.final"/> <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3"/>
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.2.2146"/> <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.2"/>
<PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0"/> <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0"/>
<PackageReference Include="Mono.Cecil" Version="0.11.4"/> <PackageReference Include="Mono.Cecil" Version="0.11.4"/>
<PackageReference Include="Newtonsoft.Json" Version="13.0.2-beta1"/> <PackageReference Include="Newtonsoft.Json" Version="13.0"/>
<PackageReference Include="System.CodeDom" Version="6.0.2-mauipre.1.22102.15"/> <PackageReference Include="System.CodeDom" Version="6.0"/>
</ItemGroup> </ItemGroup>
</Project> </Project>

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

@@ -165,12 +165,12 @@ namespace Flax.Build.Projects.VisualStudio
// Nuget Package References // Nuget Package References
csProjectFileContent.AppendLine(" <ItemGroup>"); csProjectFileContent.AppendLine(" <ItemGroup>");
csProjectFileContent.AppendLine(" <PackageReference Include=\"DotNetZip\" Version=\"1.16.0\" />"); csProjectFileContent.AppendLine(" <PackageReference Include=\"DotNetZip\" Version=\"1.16\" />");
csProjectFileContent.AppendLine(" <PackageReference Include=\"Microsoft.CodeAnalysis.CSharp\" Version=\"4.3.0-2.final\" />"); csProjectFileContent.AppendLine(" <PackageReference Include=\"Microsoft.CodeAnalysis.CSharp\" Version=\"4.3\" />");
csProjectFileContent.AppendLine(" <PackageReference Include=\"Microsoft.VisualStudio.Setup.Configuration.Interop\" Version=\"3.2.2146\" />"); csProjectFileContent.AppendLine(" <PackageReference Include=\"Microsoft.VisualStudio.Setup.Configuration.Interop\" Version=\"3.2\" />");
csProjectFileContent.AppendLine(" <PackageReference Include=\"Microsoft.Windows.Compatibility\" Version=\"6.0.0\" />"); csProjectFileContent.AppendLine(" <PackageReference Include=\"Microsoft.Windows.Compatibility\" Version=\"6.0\" />");
csProjectFileContent.AppendLine(" <PackageReference Include=\"Newtonsoft.Json\" Version=\"13.0.2-beta1\" />"); csProjectFileContent.AppendLine(" <PackageReference Include=\"Newtonsoft.Json\" Version=\"13.0\" />");
csProjectFileContent.AppendLine(" <PackageReference Include=\"System.CodeDom\" Version=\"6.0.2-mauipre.1.22102.15\" />"); csProjectFileContent.AppendLine(" <PackageReference Include=\"System.CodeDom\" Version=\"6.0\" />");
csProjectFileContent.AppendLine(" </ItemGroup>"); csProjectFileContent.AppendLine(" </ItemGroup>");
// References // References