[release/10.0.1xx-preview1] [main] Update dependencies from dotnet/ar…

…cade (#46428) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Matt Mitchell (.NET) <[email protected]>
dotnet · Jan 31, 2025 · ee4ea82 · ee4ea82
1 parent cfd2aca
commit ee4ea82
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 28 deletions.
diff --git a/eng/Publishing.props b/eng/Publishing.props
@@ -94,7 +94,8 @@
     <ItemGroup>
       <ToolsetAssetsToPushToBlobFeed Include="@(ToolsetAssetsToPublish)"
         RelativeBlobPath="$(BlobStoragePartialRelativePath)/$(ToolsetVersionValue)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('\' ,'/'))"
-        IsShipping="false" />
+        IsShipping="false"
+        PublishFlatContainer="true" />
       <ToolsetAssetsToPushToBlobFeed ManifestArtifactData="Visibility=%(Visibility)" />
     </ItemGroup>
 
@@ -104,16 +105,10 @@
     </ItemGroup>
 
     <PushToBuildStorage
-      PublishFlatContainer="true"
       AzureDevOpsCollectionUri="$(SYSTEM_TEAMFOUNDATIONCOLLECTIONURI)"
       AzureDevOpsProject="$(SYSTEM_TEAMPROJECT)"
       AzureDevOpsBuildId="$(BUILD_BUILDID)"
       ItemsToPush="@(ToolsetAssetsToPushToBlobFeed)"
-      ItemsToSign="@(ItemsToSignPostBuild)"
-      StrongNameSignInfo="@(StrongNameSignInfo)"
-      CertificatesSignInfo="@(CertificatesSignInfo)"
-      FileSignInfo="@(FileSignInfo)"
-      FileExtensionSignInfo="@(FileExtensionSignInfo)"
       ManifestBuildData="@(ManifestBuildData)"
       ManifestRepoUri="$(BUILD_REPOSITORY_NAME)"
       ManifestBranch="$(BUILD_SOURCEBRANCH)"
@@ -204,17 +199,20 @@
       <!-- Always publish blobs to a suffixed directory. -->
       <SdkAssetsToPushToBlobFeed Include="@(SdkAssetsToPublish)">
         <RelativeBlobPath>$(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)'))</RelativeBlobPath>
+        <PublishFlatContainer>true</PublishFlatContainer>
         <ManifestArtifactData>DotNetReleaseShipping=true</ManifestArtifactData>
       </SdkAssetsToPushToBlobFeed>
 
       <SdkAssetsToPushToBlobFeed Include="@(SdkNonShippingAssetsToPublish)">
         <RelativeBlobPath>$(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)'))</RelativeBlobPath>
         <ManifestArtifactData>NonShipping=true</ManifestArtifactData>
+        <PublishFlatContainer>true</PublishFlatContainer>
       </SdkAssetsToPushToBlobFeed>
 
       <ChecksumsToPushToBlobFeed Include="@(CheckSumsToPublish)">
         <RelativeBlobPath>$(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)'))</RelativeBlobPath>
         <ManifestArtifactData>DotNetReleaseShipping=true</ManifestArtifactData>
+        <PublishFlatContainer>true</PublishFlatContainer>
       </ChecksumsToPushToBlobFeed>
     </ItemGroup>
 
@@ -230,7 +228,6 @@
     </ItemGroup>
 
     <PushToBuildStorage
-      PublishFlatContainer="true"
       AzureDevOpsCollectionUri="$(SYSTEM_TEAMFOUNDATIONCOLLECTIONURI)"
       AzureDevOpsProject="$(SYSTEM_TEAMPROJECT)"
       AzureDevOpsBuildId="$(BUILD_BUILDID)"

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -604,34 +604,34 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25079.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25080.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
+      <Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25079.2">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25080.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
+      <Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25079.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25080.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
+      <Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25079.2">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25080.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
+      <Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25079.2">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25080.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
+      <Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25079.2">
+    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25080.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
+      <Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25079.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25080.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
+      <Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.1.25078.5">

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -271,10 +271,10 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25079.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
-    <MicrosoftDotNetSignToolVersion>10.0.0-beta.25079.2</MicrosoftDotNetSignToolVersion>
-    <MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25079.2</MicrosoftDotNetXliffTasksVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25079.2</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25080.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetSignToolVersion>10.0.0-beta.25080.5</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25080.5</MicrosoftDotNetXliffTasksVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25080.5</MicrosoftDotNetXUnitExtensionsVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sourcelink -->

diff --git a/global.json b/global.json
@@ -17,8 +17,8 @@
     "cmake": "latest"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25079.2",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25079.2",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25080.5",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25080.5",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
   }