Cleanup Win8 & Win10 refs

lionfire · Apr 17, 2023 · 3a5851c · 3a5851c
1 parent e27c568
commit 3a5851c
Show file tree

Hide file tree

Showing 13 changed files with 1 addition and 2,624 deletions.
diff --git a/build/Stride.build b/build/Stride.build
@@ -182,9 +182,7 @@ Example of use:
     <MSBuild Targets="Restore" Projects="$(MSBuildThisFileFullPath)" Properties="StridePlatforms=iOS;StrideSolution=$(StrideSolution).iOS"/>
     <MSBuild Targets="Build" Projects="$(StrideSolution).iOS.sln" Properties="$(BuildProperties);StridePlatforms=iOS;StrideSkipAutoPack=true;StrideSkipUnitTests=true"/>
   </Target>
-
-  <Target Name="BuildWindows10" DependsOnTargets="BuildUWP" />
-
+
   <Target Name="BuildUWP">
     <PropertyGroup>
       <StrideSolution>$(StrideSolution).Runtime</StrideSolution>

diff --git a/deps/freetype/build.bat b/deps/freetype/build.bat
@@ -1,11 +1,6 @@
 call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\vc\vcvarsall.bat" x86
 msbuild ..\..\externals\freetype\builds\windows\vc2013\freetype.vcxproj /Property:Configuration=Release;StridePlatform=Windows;Platform=Win32
 msbuild ..\..\externals\freetype\builds\windows\vc2013\freetype.vcxproj /Property:Configuration=Release;StridePlatform=Windows;Platform=x64
-msbuild ..\..\externals\freetype\builds\windows\vc2013\freetype.vcxproj /Property:Configuration=Release;StridePlatform=Windows10;Platform=x64
-msbuild ..\..\externals\freetype\builds\windows\vc2013\freetype.vcxproj /Property:Configuration=Release;StridePlatform=Windows10;Platform=Win32
-msbuild ..\..\externals\freetype\builds\windows\vc2013\freetype.vcxproj /Property:Configuration=Release;StridePlatform=Windows10;Platform=ARM
 
 xcopy /Y /S ..\..\externals\freetype\builds\windows\vc2013\bin\Windows\Release\*.dll Windows\
 xcopy /Y /S ..\..\externals\freetype\builds\windows\vc2013\bin\Windows\Release\*.pdb Windows\
-xcopy /Y /S ..\..\externals\freetype\builds\windows\vc2013\bin\Windows10\Release\*.dll Windows10\
-xcopy /Y /S ..\..\externals\freetype\builds\windows\vc2013\bin\Windows10\Release\*.pdb Windows10\
diff --git a/sources/core/Stride.Core/PlatformType.cs b/sources/core/Stride.Core/PlatformType.cs
@@ -60,12 +60,5 @@ public enum PlatformType
         /// macOS
         /// </summary>
         macOS,
-#pragma warning restore SA1300 // Element must begin with upper-case letter
-
-        /// <summary>
-        /// The Universal Windows Platform (UWP). Please use <see cref="UWP"/> intead.
-        /// </summary>
-        [Obsolete("Please use UWP instead")]
-        Windows10 = UWP,
     }
 }
diff --git a/sources/targets/MSBuild.Sdk.Extras/Inference.targets b/sources/targets/MSBuild.Sdk.Extras/Inference.targets
@@ -12,7 +12,6 @@
     <TargetFramework Condition="'$(TargetFramework)' == 'net-cf'">net35-cf</TargetFramework>
     <TargetFramework Condition="'$(TargetFramework)' == 'netmf'">netmf44</TargetFramework>
     <TargetFramework Condition="'$(TargetFramework)' == 'net'">net45</TargetFramework>
-    <TargetFramework Condition="'$(TargetFramework)' == 'win'">win8</TargetFramework>
   </PropertyGroup>
 
   <!--

diff --git a/sources/targets/MSBuild.Sdk.Extras/Platforms/Windows.targets b/sources/targets/MSBuild.Sdk.Extras/Platforms/Windows.targets
@@ -10,28 +10,6 @@
     <_SdkImplicitFrameworkProfileDefine Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">WINDOWS_UWP</_SdkImplicitFrameworkProfileDefine>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'win' OR '$(TargetFramework)' == 'win8' OR '$(TargetFramework)' == 'win80'">
-    <TargetPlatformVersion>8.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>8.0</TargetPlatformMinVersion>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
-    <NugetTargetMoniker>Windows,Version=v8.0</NugetTargetMoniker>
-
-    <!-- Need to override the built-in implicit defines for win8 or it'll be NETCORE4_5 -->
-    <ImplicitFrameworkDefine Condition="'$(DisableImplicitFrameworkDefines)' != 'true'">WINDOWS8</ImplicitFrameworkDefine>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)' == 'win81'">
-    <TargetPlatformVersion>8.1</TargetPlatformVersion>
-    <TargetPlatformMinVersion>8.1</TargetPlatformMinVersion>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
-    <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
-    <NugetTargetMoniker>Windows,Version=v8.1</NugetTargetMoniker>
-
-    <!-- Need to override the built-in implicit defines for win81 or it'll be NETCORE4_5_1 -->
-    <ImplicitFrameworkDefine Condition="'$(DisableImplicitFrameworkDefines)' != 'true'">WINDOWS8_1</ImplicitFrameworkDefine>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(_SdkShortFrameworkIdentifier)' == 'uap'">
     <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>

diff --git a/...s/tools/Stride.TextureConverter.Wrappers/DirectXTex/DirectXTex_Desktop_2015_Win10.vcxproj b/...s/tools/Stride.TextureConverter.Wrappers/DirectXTex/DirectXTex_Desktop_2015_Win10.vcxproj
diff --git a/...Stride.TextureConverter.Wrappers/DirectXTex/DirectXTex_Desktop_2015_Win10.vcxproj.filters b/...Stride.TextureConverter.Wrappers/DirectXTex/DirectXTex_Desktop_2015_Win10.vcxproj.filters