Skip to content
Permalink
Browse files

[Build] Bump to .NET 4.7.2

  • Loading branch information
xen2 committed Nov 8, 2018
1 parent 5bfb575 commit bc7ff82141756341ebb03dd238ec37dde763ca6e
Showing with 54 additions and 460 deletions.
  1. +2 −2 README.md
  2. +1 −1 samples/Tests/Xenko.Samples.Tests.csproj
  3. +1 −1 samples/Tests/app.config
  4. +1 −1 sources/assets/Xenko.Core.Assets.CompilerApp/NuGetAssemblyResolver.cs
  5. +1 −1 sources/assets/Xenko.Core.Assets.CompilerApp/build/Xenko.Core.Assets.CompilerApp.targets
  6. +1 −1 sources/core/Xenko.Core.AssemblyProcessor.Tests/Xenko.Core.AssemblyProcessor.Tests.csproj
  7. +1 −1 sources/core/Xenko.Core.AssemblyProcessor/Xenko.Core.AssemblyProcessor.csproj
  8. +1 −1 sources/core/Xenko.Core.Tests/Xenko.Core.Tests.csproj
  9. +2 −2 sources/editor/Xenko.Core.Assets.Editor.Tests/packages.config
  10. +1 −1 sources/editor/Xenko.GameStudio/app.config
  11. +1 −1 sources/editor/Xenko.SamplesBootstrapper/app.config
  12. +1 −1 sources/engine/Xenko.Assets.Tests/Xenko.Assets.Tests.csproj
  13. +1 −1 sources/engine/Xenko.Assets.Tests2/Xenko.Assets.Tests2.csproj
  14. +1 −1 sources/engine/Xenko.Shaders.Tests/Xenko.Shaders.Tests.Windows.csproj
  15. +5 −5 sources/launcher/Prerequisites/launcher-prerequisites.aip
  16. +3 −3 sources/launcher/Setup/setup.aip
  17. +0 −407 sources/launcher/Setup/setup.back.aip
  18. +1 −1 sources/launcher/Xenko.Launcher/App.config
  19. +3 −3 sources/launcher/Xenko.Launcher/Xenko.Launcher.csproj
  20. +1 −1 sources/launcher/Xenko.LauncherApp/App.config
  21. +3 −3 sources/launcher/Xenko.LauncherApp/Program.cs
  22. +2 −2 sources/launcher/Xenko.LauncherApp/Xenko.LauncherApp.csproj
  23. +3 −3 sources/prerequisites/prerequisites.aip
  24. +2 −2 sources/targets/Xenko.Core.GlobalSettings.targets
  25. +1 −1 sources/targets/Xenko.GlobalSettings.targets
  26. +1 −1 sources/tools/Xenko.Core.ProjectTemplating.Tests/Xenko.Core.ProjectTemplating.Tests.csproj
  27. +1 −1 sources/tools/Xenko.Core.Translation.Extractor/App.config
  28. +1 −3 sources/tools/Xenko.VisualStudio.Commands/Xenko.VisualStudio.Commands.csproj
  29. +10 −7 sources/tools/Xenko.VisualStudio.Package/Xenko.VisualStudio.Package.csproj
  30. +1 −1 sources/tools/Xenko.VisualStudio.Package/source.extension.vsixmanifest
@@ -41,8 +41,8 @@ Ask for help or report issues:
1. [Git](https://git-scm.com/downloads) (recent version that includes LFS, or install [Git LFS](https://git-lfs.github.com/) separately).
2. [Visual Studio 2017](https://www.visualstudio.com/downloads/) with the following workloads:
* `.NET desktop development`
* If your OS is Windows 10: add `.NET Framework 4.6.2 development tools` in optional components of `.NET desktop development`
* If your OS is Windows 7: [.NET 4.6.2 Developer Pack](https://www.microsoft.com/net/download/thank-you/net462-developer-pack))
* If your OS is Windows 10: add `.NET Framework 4.7.2 development tools` in optional components of `.NET desktop development`
* If your OS is Windows 7: [.NET 4.7.2 Developer Pack](https://www.microsoft.com/net/download/thank-you/net472-developer-pack))
* `Desktop development with C++`
* `.NET Core cross-platform development`
* Optional (to target UWP): `Universal Windows Platform development`
@@ -2,7 +2,7 @@
<Import Project="..\..\sources\targets\Xenko.PreSettings.targets" />
<Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="1.6.55" />
<PropertyGroup>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net472</TargetFramework>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
@@ -33,6 +33,6 @@
</assemblyBinding>
</runtime>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
</startup>
</configuration>
@@ -55,7 +55,7 @@ internal static void __Initialize__()
{
new TargetFrameworkInformation
{
FrameworkName = NuGetFramework.Parse("net462"),
FrameworkName = NuGetFramework.Parse("net472"),
}
},
};
@@ -23,7 +23,7 @@
<!--asset OutputPath for other platforms. Note: this is overridden for UnitTests projects. -->
<XenkoCompileAssetOutputPath Condition="'$(XenkoCompileAssetOutputPath)' == ''">$(TargetDir)data</XenkoCompileAssetOutputPath>

<XenkoCompileAssetCommand Condition="'$(XenkoCompileAssetCommand)' == ''">$(MSBuildThisFileDirectory)..\lib\net462\Xenko.Core.Assets.CompilerApp.exe</XenkoCompileAssetCommand>
<XenkoCompileAssetCommand Condition="'$(XenkoCompileAssetCommand)' == ''">$(MSBuildThisFileDirectory)..\lib\net472\Xenko.Core.Assets.CompilerApp.exe</XenkoCompileAssetCommand>

<!--<XenkoCompileAssetCommandProxy Condition="'$(DisableAssetCompilerExecServerProxy)' == 'true' Or '$(XenkoDisableAssetCompilerExecServerProxy)' == 'true'">&quot;$(XenkoCompileAssetCommand)&quot;</XenkoCompileAssetCommandProxy>
<XenkoCompileAssetCommandProxy Condition="'$(XenkoCompileAssetCommandProxy)' == ''">&quot;$(XenkoPackageXenkoSdkBin)\Xenko.Core.Assets.CompilerClient.exe&quot;</XenkoCompileAssetCommandProxy>-->
@@ -2,7 +2,7 @@
<PropertyGroup>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net472</TargetFramework>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -3,7 +3,7 @@
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<OutputType>Exe</OutputType>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net472</TargetFramework>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -5,7 +5,7 @@
<OutputType>Library</OutputType>
<AssemblyName>Xenko.Core.Tests</AssemblyName>
<RootNamespace>Xenko.Core.Tests</RootNamespace>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net472</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<EnableDefaultItems>false</EnableDefaultItems>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="System.Runtime" version="4.3.0" targetFramework="net462" />
</packages>
<package id="System.Runtime" version="4.3.0" targetFramework="net472" />
</packages>
@@ -33,6 +33,6 @@
</assemblyBinding>
</runtime>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
</startup>
</configuration>
@@ -33,6 +33,6 @@
</assemblyBinding>
</runtime>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
</startup>
</configuration>
@@ -5,7 +5,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>Xenko.Assets.Tests</RootNamespace>
<AssemblyName>Xenko.Assets.Tests</AssemblyName>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net472</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<EnableDefaultItems>false</EnableDefaultItems>
<XenkoPlatform>Windows</XenkoPlatform>
@@ -5,7 +5,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>Xenko.Assets.Tests2</RootNamespace>
<AssemblyName>Xenko.Assets.Tests2</AssemblyName>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net472</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<EnableDefaultItems>false</EnableDefaultItems>
<XenkoPlatform>Windows</XenkoPlatform>
@@ -5,7 +5,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>Xenko.Physics.Tests</RootNamespace>
<AssemblyName>Xenko.Physics.Tests</AssemblyName>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net472</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<EnableDefaultItems>false</EnableDefaultItems>
<XenkoPlatform>Windows</XenkoPlatform>
@@ -158,8 +158,8 @@
<ROW Action="AI_ExtractFiles" Sequence="3998" Builds="DefaultBuild"/>
<ROW Action="AI_DATA_SETTER" Sequence="3997"/>
<ROW Action="AI_EstimateExtractFiles" Sequence="3999" Builds="DefaultBuild"/>
<ROW Action="AI_AppSearchEx" Sequence="101"/>
<ROW Action="AI_EnableDebugLog" Sequence="51"/>
<ROW Action="AI_AppSearchEx" Sequence="101"/>
<ATTRIBUTE name="RegisterProduct" value="false"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiInstallUISequenceComponent">
@@ -169,8 +169,8 @@
<ROW Action="AI_DpiContentScale" Sequence="52"/>
<ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Sequence="99"/>
<ROW Action="AI_RESTORE_AI_SETUPEXEPATH" Condition="AI_SETUPEXEPATH_ORIGINAL" Sequence="102"/>
<ROW Action="AI_AppSearchEx" Sequence="101"/>
<ROW Action="AI_EnableDebugLog" Sequence="51"/>
<ROW Action="AI_AppSearchEx" Sequence="101"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiLaunchConditionsComponent">
<ROW Condition="( Version9X OR ( NOT VersionNT64 ) OR ( VersionNT64 AND ((VersionNT64 &lt;&gt; 502) OR (ServicePackLevel &lt;&gt; 2) OR (MsiNTProductType &lt;&gt; 1)) AND ((VersionNT64 &lt;&gt; 502) OR (ServicePackLevel &lt;&gt; 2) OR (MsiNTProductType = 1)) AND ((VersionNT64 &lt;&gt; 600) OR (ServicePackLevel &lt;&gt; 0) OR (MsiNTProductType &lt;&gt; 1)) AND ((VersionNT64 &lt;&gt; 600) OR (ServicePackLevel &lt;&gt; 1) OR (MsiNTProductType &lt;&gt; 1)) AND ((VersionNT64 &lt;&gt; 601) OR (ServicePackLevel &lt;&gt; 0) OR (MsiNTProductType &lt;&gt; 1)) ) )" Description="[ProductName] can not be installed on the following Windows versions: [WindowsTypeNT64Display]." DescriptionLocId="AI.LaunchCondition.NoSpecificNT64" IsPredefined="true" Builds="DefaultBuild"/>
@@ -196,10 +196,10 @@
<ROW UpgradeCode="[|UpgradeCode]" VersionMin="[|ProductVersion]" Attributes="2" ActionProperty="AI_NEWERPRODUCTFOUND"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.PreReqComponent">
<ROW PrereqKey="E6EF03A03ACB41E28F8D6A76831D390C" DisplayName=".NET Framework 4.6.2" SetupFileUrl="https://download.microsoft.com/download/F/9/4/F942F07D-F26F-4F30-B4E3-EBD54FABA377/NDP462-KB3151800-x86-x64-AllOS-ENU.exe" Location="1" ExactSize="62008080" WinNTVersions="Windows XP SP3 x86, Windows Server 2003 SP2 x86, Windows Vista x86, Windows Server 2008 x86, Windows 7 RTM x86" WinNT64Versions="Windows XP SP2 x64, Windows Server 2003 SP2 x64, Windows Vista x64, Windows Server 2008 x64, Windows 7 RTM x64, Windows Server 2008 R2 RTM x64, Windows Server 2016 x64" Operator="1" NoUiComLine="/q /norestart" Options="xy" MD5="9a5d647ee710af2b1aede329c40bbe1a" TargetName=".NET Framework 4.6.2"/>
<ATTRIBUTE name="PrereqsOrder" value="E6EF03A03ACB41E28F8D6A76831D390C"/>
<ROW PrereqKey="A6D7F21EAEB4C4A901F0979CF110936" DisplayName=".NET Framework 4.7.2" SetupFileUrl="https://download.microsoft.com/download/6/E/4/6E48E8AB-DC00-419E-9704-06DD46E5F81D/NDP472-KB4054530-x86-x64-AllOS-ENU.exe" Location="1" ExactSize="83943272" WinNTVersions="Windows XP SP3 x86, Windows Server 2003 SP2 x86, Windows Vista x86, Windows Server 2008 x86, Windows 7 RTM x86, Windows 10 version 1507 x86, Windows 10 version 1511 x86, Windows 10 version 1803 x86, Windows 10 version 1809 x86" WinNT64Versions="Windows XP SP2 x64, Windows Server 2003 SP2 x64, Windows Vista x64, Windows Server 2008 x64, Windows 7 RTM x64, Windows Server 2008 R2 RTM x64, Windows 10 version 1507 x64, Windows 10 version 1511 x64, Windows 10 version 1803 x64, Windows 10 version 1809 x64" Operator="1" NoUiComLine="/q /norestart" Options="xy" MD5="87450cfa175585b23a76bbd7052ee66b" TargetName=".NET Framework 4.7.2"/>
<ATTRIBUTE name="PrereqsOrder" value="A6D7F21EAEB4C4A901F0979CF110936"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.PreReqSearchComponent">
<ROW SearchKey="E6EF03A03ACB41E28F8D6A76831D390CRelease" Prereq="E6EF03A03ACB41E28F8D6A76831D390C" SearchType="9" SearchString="HKLM\SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\Release" RefContent="G394801" Order="1" Property="PreReqSearch_E6EF03A03ACB41E28F8D6A"/>
<ROW SearchKey="A6D7F21EAEB4C4A901F0979CF110936Rele" Prereq="A6D7F21EAEB4C4A901F0979CF110936" SearchType="9" SearchString="HKLM\SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\Release" RefContent="G461813" Order="1" Property="PreReqSearch_A6D7F21EAEB4C4A901F097"/>
</COMPONENT>
</DOCUMENT>
@@ -398,10 +398,10 @@
<ROW UpgradeCode="[|UpgradeCode]" VersionMin="[|ProductVersion]" Attributes="2" ActionProperty="AI_NEWERPRODUCTFOUND"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.PreReqComponent">
<ROW PrereqKey="E6EF03A03ACB41E28F8D6A76831D390C" DisplayName=".NET Framework 4.6.2" SetupFileUrl="https://download.microsoft.com/download/F/9/4/F942F07D-F26F-4F30-B4E3-EBD54FABA377/NDP462-KB3151800-x86-x64-AllOS-ENU.exe" Location="1" ExactSize="62008080" WinNTVersions="Windows XP SP3 x86, Windows Server 2003 SP2 x86, Windows Vista x86, Windows Server 2008 x86, Windows 7 RTM x86" WinNT64Versions="Windows XP SP2 x64, Windows Server 2003 SP2 x64, Windows Vista x64, Windows Server 2008 x64, Windows 7 RTM x64, Windows Server 2008 R2 RTM x64, Windows Server 2016 x64" Operator="1" NoUiComLine="/norestart" Options="xy" MD5="9a5d647ee710af2b1aede329c40bbe1a" TargetName=".NET Framework 4.6.2"/>
<ATTRIBUTE name="PrereqsOrder" value="E6EF03A03ACB41E28F8D6A76831D390C"/>
<ROW PrereqKey="A6D7F21EAEB4C4A901F0979CF110936" DisplayName=".NET Framework 4.7.2" SetupFileUrl="https://download.microsoft.com/download/6/E/4/6E48E8AB-DC00-419E-9704-06DD46E5F81D/NDP472-KB4054530-x86-x64-AllOS-ENU.exe" Location="1" ExactSize="83943272" WinNTVersions="Windows XP SP3 x86, Windows Server 2003 SP2 x86, Windows Vista x86, Windows Server 2008 x86, Windows 7 RTM x86, Windows 10 version 1507 x86, Windows 10 version 1511 x86, Windows 10 version 1803 x86, Windows 10 version 1809 x86" WinNT64Versions="Windows XP SP2 x64, Windows Server 2003 SP2 x64, Windows Vista x64, Windows Server 2008 x64, Windows 7 RTM x64, Windows Server 2008 R2 RTM x64, Windows 10 version 1507 x64, Windows 10 version 1511 x64, Windows 10 version 1803 x64, Windows 10 version 1809 x64" Operator="1" NoUiComLine="/q /norestart" Options="xy" MD5="87450cfa175585b23a76bbd7052ee66b" TargetName=".NET Framework 4.7.2"/>
<ATTRIBUTE name="PrereqsOrder" value="A6D7F21EAEB4C4A901F0979CF110936"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.PreReqSearchComponent">
<ROW SearchKey="E6EF03A03ACB41E28F8D6A76831D390CRelease" Prereq="E6EF03A03ACB41E28F8D6A76831D390C" SearchType="9" SearchString="HKLM\SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\Release" RefContent="G394801" Order="1" Property="PreReqSearch_E6EF03A03ACB41E28F8D6A"/>
<ROW SearchKey="A6D7F21EAEB4C4A901F0979CF110936Rele" Prereq="A6D7F21EAEB4C4A901F0979CF110936" SearchType="9" SearchString="HKLM\SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\Release" RefContent="G461813" Order="1" Property="PreReqSearch_A6D7F21EAEB4C4A901F097"/>
</COMPONENT>
</DOCUMENT>

0 comments on commit bc7ff82

Please sign in to comment.
You can’t perform that action at this time.