Update versions and tweak / simplify some version related stuff

dotnet · Nov 1, 2024 · 0d38625 · 0d38625
1 parent accf26f
commit 0d38625
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 21 deletions.
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -21,7 +21,7 @@
   </PropertyGroup>
   <!-- Packages that come from https://github.com/dotnet/winforms -->
   <PropertyGroup>
-    <MicrosoftPrivateWinformsVersion>10.0.0-alpha.1.24529.3</MicrosoftPrivateWinformsVersion>
+    <MicrosoftPrivateWinformsVersion>10.0.0-alpha.1.24531.1</MicrosoftPrivateWinformsVersion>
     <!-- Override as WinForms is still building against the 9.0 platform. -->
     <_WinFormsTargetFrameworkVersion>net9.0</_WinFormsTargetFrameworkVersion>
   </PropertyGroup>
@@ -40,11 +40,11 @@
     <SystemIOPackagingVersion>10.0.0-alpha.1.24528.7</SystemIOPackagingVersion>
     <SystemReflectionMetadataLoadContextVersion>10.0.0-alpha.1.24528.7</SystemReflectionMetadataLoadContextVersion>
     <SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
-    <SystemResourcesExtensionsVersion>10.0.0-alpha.1.24528.7</SystemResourcesExtensionsVersion>
-    <SystemRuntimeSerializationFormattersPackageVersion>10.0.0-alpha.1.24528.7</SystemRuntimeSerializationFormattersPackageVersion>
-    <SystemSecurityCryptographyXmlPackageVersion>10.0.0-alpha.1.24528.7</SystemSecurityCryptographyXmlPackageVersion>
-    <SystemSecurityPermissionsPackageVersion>10.0.0-alpha.1.24528.7</SystemSecurityPermissionsPackageVersion>
-    <SystemWindowsExtensionsPackageVersion>10.0.0-alpha.1.24528.7</SystemWindowsExtensionsPackageVersion>
+    <SystemResourcesExtensionsVersion>10.0.0-alpha.1.24530.5</SystemResourcesExtensionsVersion>
+    <SystemRuntimeSerializationFormattersPackageVersion>10.0.0-alpha.1.24530.5</SystemRuntimeSerializationFormattersPackageVersion>
+    <SystemSecurityCryptographyXmlPackageVersion>10.0.0-alpha.1.24530.5</SystemSecurityCryptographyXmlPackageVersion>
+    <SystemSecurityPermissionsPackageVersion>10.0.0-alpha.1.24530.5</SystemSecurityPermissionsPackageVersion>
+    <SystemWindowsExtensionsPackageVersion>10.0.0-alpha.1.24530.5</SystemWindowsExtensionsPackageVersion>
     <SystemRuntimeCompilerServicesUnsafePackageVersion>6.0.0</SystemRuntimeCompilerServicesUnsafePackageVersion>
   </PropertyGroup>
   <!-- Docs / Intellisense -->

diff --git a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
@@ -3,6 +3,15 @@
     Explicitly import Microsoft.NETCore.Platforms to prevent using the one from the SDK, which
     usually lags behind the version that WPF gets from CoreFx packages
   -->
+
+  <PropertyGroup>
+    <UpdatedTargetingPackVersion Condition="'$(MicrosoftNETCoreAppRefVersion)'!=''
+                                            And '$(NoTargets)'!='true'
+                                            And '$(TargetFrameworkIdentifier)' == '.NETCoreApp'
+                                            And $([MSBuild]::VersionGreaterThanOrEquals('$(TargetFrameworkVersion)', '3.0'))
+                                            And '$(MSBuildProjectExtension)'!='.vcxproj'">$(MicrosoftNETCoreAppRefVersion)</UpdatedTargetingPackVersion>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.Platforms"
                       Version="$(MicrosoftNETCorePlatformsVersion)"
@@ -12,13 +21,10 @@
                                 Version="$(MicrosoftNETCorePlatformsVersion)"
                                 Condition="'$(ManagedCxx)'=='true'"/>
 
+    <!-- This should probably update all FrameworkReference entries. -->
     <FrameworkReference Update="Microsoft.NETCore.App"
-                      Condition="'$(MicrosoftNETCoreAppRefVersion)'!=''
-                             And '$(NoTargets)'!='true'
-                             And '$(TargetFrameworkIdentifier)' == '.NETCoreApp'
-                             And $([MSBuild]::VersionGreaterThanOrEquals('$(TargetFrameworkVersion)', '3.0'))
-                             And '$(MSBuildProjectExtension)'!='.vcxproj'">
-      <TargetingPackVersion>$(MicrosoftNETCoreAppRefVersion)</TargetingPackVersion>
+                        Condition="'$(UpdatedTargetingPackVersion)'!=''">
+      <TargetingPackVersion>$(UpdatedTargetingPackVersion)</TargetingPackVersion>
     </FrameworkReference>
 
     <!--

diff --git a/global.json b/global.json
@@ -2,10 +2,8 @@
   "tools": {
     "dotnet": "10.0.100-alpha.1.24530.9",
     "runtimes": {
-      "dotnet/x64": [
-        "$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)"
-      ],
-      "dotnet/x86": [
+      "dotnet": [
+        "2.1.7",
         "$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)"
       ]
     },

diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj
@@ -51,15 +51,13 @@
     Limit the assemblies that are packaged into Microsoft.NET.Sdk.WindowsDesktop
   -->
   <ItemGroup Condition="'$(TargetFramework)'=='net472'">
-    <PackagingAssemblyContent Include="PresentationBuildTasks.dll" />
     <PackagingAssemblyContent Include="System.Collections.Immutable.dll" />
     <PackagingAssemblyContent Include="System.Memory.dll" />
     <PackagingAssemblyContent Include="System.Numerics.Vectors.dll" />
     <PackagingAssemblyContent Include="System.Reflection.Metadata.dll" />
-    <PackagingAssemblyContent Include="System.Reflection.MetadataLoadContext.dll" />
     <PackagingAssemblyContent Include="System.Runtime.CompilerServices.Unsafe.dll" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
+  <ItemGroup>
     <PackagingAssemblyContent Include="PresentationBuildTasks.dll" />
     <PackagingAssemblyContent Include="System.Reflection.MetadataLoadContext.dll" />
   </ItemGroup>

diff --git a/src/Microsoft.DotNet.Wpf/tests/UnitTests/Directory.Build.targets b/src/Microsoft.DotNet.Wpf/tests/UnitTests/Directory.Build.targets
@@ -41,10 +41,18 @@
   -->
   <Target Name="FixupRuntimeFrameworkVersions" AfterTargets="ProcessFrameworkReferences" BeforeTargets="GenerateBuildDependencyFile">
     <PropertyGroup>
+      <!--
+        This would be more correct to just match the TargetFramework version between the RuntimeFramework and the KnownFramework.
+      -->
+
+      <!-- Find the Major.Minor out of the updated targeting pack semantic version. -->
+      <_targetPackVersion Condition="'$(UpdatedTargetingPackVersion)' != ''">$([System.Text.RegularExpressions.Regex]::Match($(UpdatedTargetingPackVersion), '^(\d+)\.(\d+)').Value)</_targetPackVersion>
+
       <!-- Split out the target framework. "net10.0-windows" is an example. -->
       <_targetFrameworkIdentifier>$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))</_targetFrameworkIdentifier>
       <_targetFrameworkIdentifier Condition="'$(_targetFrameworkIdentifier)' == '.NETCoreApp'">net</_targetFrameworkIdentifier>
-      <_targetFrameworkVersion>$([MSBuild]::GetTargetFrameworkVersion($(TargetFramework)))</_targetFrameworkVersion>
+      <_targetFrameworkVersion Condition="'$(_targetPackVersion)' != ''">$(_targetPackVersion)</_targetFrameworkVersion>
+      <_targetFrameworkVersion Condition="'$(_targetFrameworkVersion)' == ''">$([MSBuild]::GetTargetFrameworkVersion($(TargetFramework)))</_targetFrameworkVersion>
       <_targetFrameworkRoot>$(_targetFrameworkIdentifier)$(_targetFrameworkVersion)</_targetFrameworkRoot>
     </PropertyGroup>
     <ItemGroup>

diff --git a/src/Microsoft.DotNet.Wpf/tests/UnitTests/WindowsBase.Tests/WindowsBase.Tests.csproj b/src/Microsoft.DotNet.Wpf/tests/UnitTests/WindowsBase.Tests/WindowsBase.Tests.csproj
@@ -4,7 +4,7 @@
     <Nullable>enable</Nullable>
     <Platforms>x64;x86;ARM64</Platforms>
     <RootNamespace />
-    <TargetFramework>net10.0-windows</TargetFramework>
+    <TargetFramework Condition="!$(TargetFramework.Contains('windows'))">$(TargetFramework)-windows</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>