Add runtime version workarounds

dotnet · Nov 11, 2022 · 651d90e · 651d90e
1 parent 2a72241
commit 651d90e
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 2 deletions.
diff --git a/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj b/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj
@@ -19,8 +19,10 @@
     <PackageDownload Include="Microsoft.NET.Sdk.tvOS.Manifest-$(MauiFeatureBand)" Version="[$(XamarinTvOSWorkloadManifestVersion)]" />
     <PackageDownload Include="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="[$(EmscriptenWorkloadManifestVersion)]" />
     <PackageDownload Include="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="[$(EmscriptenWorkloadManifestVersion)]" />
-    <PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.net6.Manifest-7.0.100" Version="[$(MonoWorkloadManifestVersion)]" />
-    <PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.net7.Manifest-7.0.100" Version="[$(MonoWorkloadManifestVersion)]" />
+    <!-- TODO: Revert with src/SourceBuild/tarball/patches/runtime/0001-Update-branding-to-7-0-1.patch
+         This is needed because a 7.0.1 manifest doesn't exist in public yet. -->
+    <PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.net6.Manifest-7.0.100" Version="[7.0.0]" />
+    <PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.net7.Manifest-7.0.100" Version="[7.0.0]" />
   </ItemGroup>
 
   <!--

diff --git a/src/SourceBuild/tarball/patches/installer/0001-Update-runtime-version.patch b/src/SourceBuild/tarball/patches/installer/0001-Update-runtime-version.patch
@@ -0,0 +1,51 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MichaelSimons <msimons@microsoft.com>
+Date: Fri, 11 Nov 2022 20:21:27 +0000
+Subject: [PATCH] Update runtime version
+
+---
+ eng/Versions.props                          | 10 +++++-----
+ src/redist/targets/BundledManifests.targets |  4 ++--
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/eng/Versions.props b/eng/Versions.props
+index 31db48967..4da93d914 100644
+--- a/eng/Versions.props
++++ b/eng/Versions.props
+@@ -72,16 +72,16 @@
+   </PropertyGroup>
+   <PropertyGroup>
+     <!-- Dependencies from https://github.com/dotnet/corefx -->
+-    <MicrosoftNETCorePlatformsPackageVersion>7.0.0</MicrosoftNETCorePlatformsPackageVersion>
++    <MicrosoftNETCorePlatformsPackageVersion>7.0.1</MicrosoftNETCorePlatformsPackageVersion>
+   </PropertyGroup>
+   <PropertyGroup>
+     <!-- Dependencies from https://github.com/dotnet/core-setup -->
+     <VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-rtm.22518.5</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
+     <VSRedistCommonNetCoreTargetingPackx6470PackageVersion>7.0.0-rtm.22518.5</VSRedistCommonNetCoreTargetingPackx6470PackageVersion>
+-    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+-    <MicrosoftNETCoreAppHostwinx64PackageVersion>7.0.0</MicrosoftNETCoreAppHostwinx64PackageVersion>
+-    <MicrosoftNETCoreAppRefPackageVersion>7.0.0</MicrosoftNETCoreAppRefPackageVersion>
+-    <MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0</MicrosoftNETCoreDotNetHostResolverPackageVersion>
++    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
++    <MicrosoftNETCoreAppHostwinx64PackageVersion>7.0.1</MicrosoftNETCoreAppHostwinx64PackageVersion>
++    <MicrosoftNETCoreAppRefPackageVersion>7.0.1</MicrosoftNETCoreAppRefPackageVersion>
++    <MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
+     <NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
+   </PropertyGroup>
+   <PropertyGroup>
+diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets
+index 6c42909d8..fb4b57200 100644
+--- a/src/redist/targets/BundledManifests.targets
++++ b/src/redist/targets/BundledManifests.targets
+@@ -6,8 +6,8 @@
+     <BundledManifests Include="Microsoft.NET.Sdk.macOS" FeatureBand="$(MauiFeatureBand)" Version="$(XamarinMacOSWorkloadManifestVersion)" />
+     <BundledManifests Include="Microsoft.NET.Sdk.Maui" FeatureBand="$(MauiFeatureBand)" Version="$(MauiWorkloadManifestVersion)" />
+     <BundledManifests Include="Microsoft.NET.Sdk.tvOS" FeatureBand="$(MauiFeatureBand)" Version="$(XamarinTvOSWorkloadManifestVersion)" />
+-    <BundledManifests Include="Microsoft.NET.Workload.Mono.ToolChain.net6" FeatureBand="7.0.100" Version="$(MonoWorkloadManifestVersion)" />
+-    <BundledManifests Include="Microsoft.NET.Workload.Mono.ToolChain.net7" FeatureBand="7.0.100" Version="$(MonoWorkloadManifestVersion)" />
++    <BundledManifests Include="Microsoft.NET.Workload.Mono.ToolChain.net6" FeatureBand="7.0.100" Version="7.0.0" />
++    <BundledManifests Include="Microsoft.NET.Workload.Mono.ToolChain.net7" FeatureBand="7.0.100" Version="7.0.0" />
+     <BundledManifests Include="Microsoft.NET.Workload.Emscripten.net6" FeatureBand="7.0.100" Version="$(EmscriptenWorkloadManifestVersion)" />
+     <BundledManifests Include="Microsoft.NET.Workload.Emscripten.net7" FeatureBand="7.0.100" Version="$(EmscriptenWorkloadManifestVersion)" />
+   </ItemGroup>