Update to arcade with WiX fix (225808)

dotnet · May 17, 2024 · 00eeef6 · 00eeef6
1 parent 3a95346
commit 00eeef6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 16 deletions.
diff --git a/NuGet.config b/NuGet.config
@@ -4,10 4,8 @@
  <clear />
  <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
  <!-- Begin: Package sources from dotnet-efcore -->
- <add key="darc-int-dotnet-efcore-121c96f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-121c96f4/nuget/v3/index.json" />
  <!-- End: Package sources from dotnet-efcore -->
  <!-- Begin: Package sources from dotnet-runtime -->
- <add key="darc-int-dotnet-runtime-19f489b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-19f489b8/nuget/v3/index.json" />
  <!-- End: Package sources from dotnet-runtime -->
  <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
  <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -26,10 24,8 @@
  <clear />
  <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
  <!-- Begin: Package sources from dotnet-efcore -->
- <add key="darc-int-dotnet-efcore-121c96f" value="true" />
  <!-- End: Package sources from dotnet-efcore -->
  <!-- Begin: Package sources from dotnet-runtime -->
- <add key="darc-int-dotnet-runtime-19f489b" value="true" />
  <!-- End: Package sources from dotnet-runtime -->
  <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
  </disabledPackageSources>

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -302,22 302,22 @@
  <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
  <Sha>8587d13a2764c025277d628471984bae8e16427c</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24209.2">
  <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24266.2">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>91f852db39356b3f8fd9efa00a3dee82a9a7c2b3</Sha>
  <Sha>4c7a2a3a3a23698ba4ce15cf9a98560c654483b6</Sha>
  <SourceBuild RepoName="arcade" ManagedOnly="true" />
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.24209.2">
  <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.24266.2">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>91f852db39356b3f8fd9efa00a3dee82a9a7c2b3</Sha>
  <Sha>4c7a2a3a3a23698ba4ce15cf9a98560c654483b6</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.24209.2">
  <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.24266.2">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>91f852db39356b3f8fd9efa00a3dee82a9a7c2b3</Sha>
  <Sha>4c7a2a3a3a23698ba4ce15cf9a98560c654483b6</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24209.2">
  <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24266.2">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>91f852db39356b3f8fd9efa00a3dee82a9a7c2b3</Sha>
  <Sha>4c7a2a3a3a23698ba4ce15cf9a98560c654483b6</Sha>
  </Dependency>
  </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -134,8 134,8 @@
  <MicrosoftEntityFrameworkCoreVersion>7.0.19</MicrosoftEntityFrameworkCoreVersion>
  <MicrosoftEntityFrameworkCoreDesignVersion>7.0.19</MicrosoftEntityFrameworkCoreDesignVersion>
  <!-- Packages from dotnet/arcade -->
- <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.24209.2</MicrosoftDotNetBuildTasksInstallersVersion>
- <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.24209.2</MicrosoftDotNetBuildTasksTemplatingVersion>
  <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.24266.2</MicrosoftDotNetBuildTasksInstallersVersion>
  <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.24266.2</MicrosoftDotNetBuildTasksTemplatingVersion>
  <!-- Packages from dotnet/source-build-externals -->
  <MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>7.0.0-alpha.1.24210.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
  <!-- Packages from dotnet/xdt -->

diff --git a/eng/common/loc/P22DotNetHtmlLocalization.lss b/eng/common/loc/P22DotNetHtmlLocalization.lss
diff --git a/global.json b/global.json
@@ -27,7 27,7 @@
  },
  "msbuild-sdks": {
  "Yarn.MSBuild": "1.22.19",
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24209.2",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24209.2"
  "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24266.2",
  "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24266.2"
  }
 }