Skip to content

Commit ee4ea82

Browse files
github-actions[bot]dotnet-maestro[bot]mmitche
authored
[release/10.0.1xx-preview1] [main] Update dependencies from dotnet/arcade (#46428)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Matt Mitchell (.NET) <mmitche@microsoft.com>
1 parent cfd2aca commit ee4ea82

File tree

4 files changed

+25
-28
lines changed

4 files changed

+25
-28
lines changed

‎eng/Publishing.props

+5-8
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@
9494
<ItemGroup>
9595
<ToolsetAssetsToPushToBlobFeed Include="@(ToolsetAssetsToPublish)"
9696
RelativeBlobPath="$(BlobStoragePartialRelativePath)/$(ToolsetVersionValue)/$([System.String]::Copy('%(Filename)%(Extension)').Replace('\' ,'/'))"
97-
IsShipping="false" />
97+
IsShipping="false"
98+
PublishFlatContainer="true" />
9899
<ToolsetAssetsToPushToBlobFeed ManifestArtifactData="Visibility=%(Visibility)" />
99100
</ItemGroup>
100101

@@ -104,16 +105,10 @@
104105
</ItemGroup>
105106

106107
<PushToBuildStorage
107-
PublishFlatContainer="true"
108108
AzureDevOpsCollectionUri="$(SYSTEM_TEAMFOUNDATIONCOLLECTIONURI)"
109109
AzureDevOpsProject="$(SYSTEM_TEAMPROJECT)"
110110
AzureDevOpsBuildId="$(BUILD_BUILDID)"
111111
ItemsToPush="@(ToolsetAssetsToPushToBlobFeed)"
112-
ItemsToSign="@(ItemsToSignPostBuild)"
113-
StrongNameSignInfo="@(StrongNameSignInfo)"
114-
CertificatesSignInfo="@(CertificatesSignInfo)"
115-
FileSignInfo="@(FileSignInfo)"
116-
FileExtensionSignInfo="@(FileExtensionSignInfo)"
117112
ManifestBuildData="@(ManifestBuildData)"
118113
ManifestRepoUri="$(BUILD_REPOSITORY_NAME)"
119114
ManifestBranch="$(BUILD_SOURCEBRANCH)"
@@ -204,17 +199,20 @@
204199
<!-- Always publish blobs to a suffixed directory. -->
205200
<SdkAssetsToPushToBlobFeed Include="@(SdkAssetsToPublish)">
206201
<RelativeBlobPath>$(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)'))</RelativeBlobPath>
202+
<PublishFlatContainer>true</PublishFlatContainer>
207203
<ManifestArtifactData>DotNetReleaseShipping=true</ManifestArtifactData>
208204
</SdkAssetsToPushToBlobFeed>
209205

210206
<SdkAssetsToPushToBlobFeed Include="@(SdkNonShippingAssetsToPublish)">
211207
<RelativeBlobPath>$(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)'))</RelativeBlobPath>
212208
<ManifestArtifactData>NonShipping=true</ManifestArtifactData>
209+
<PublishFlatContainer>true</PublishFlatContainer>
213210
</SdkAssetsToPushToBlobFeed>
214211

215212
<ChecksumsToPushToBlobFeed Include="@(CheckSumsToPublish)">
216213
<RelativeBlobPath>$(BlobStoragePartialRelativePath)/$(FullNugetVersion)/$([System.String]::Copy('%(Filename)%(Extension)'))</RelativeBlobPath>
217214
<ManifestArtifactData>DotNetReleaseShipping=true</ManifestArtifactData>
215+
<PublishFlatContainer>true</PublishFlatContainer>
218216
</ChecksumsToPushToBlobFeed>
219217
</ItemGroup>
220218

@@ -230,7 +228,6 @@
230228
</ItemGroup>
231229

232230
<PushToBuildStorage
233-
PublishFlatContainer="true"
234231
AzureDevOpsCollectionUri="$(SYSTEM_TEAMFOUNDATIONCOLLECTIONURI)"
235232
AzureDevOpsProject="$(SYSTEM_TEAMPROJECT)"
236233
AzureDevOpsBuildId="$(BUILD_BUILDID)"

‎eng/Version.Details.xml

+14-14
Original file line numberDiff line numberDiff line change
@@ -604,34 +604,34 @@
604604
</Dependency>
605605
</ProductDependencies>
606606
<ToolsetDependencies>
607-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25079.2">
607+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25080.5">
608608
<Uri>https://github.com/dotnet/arcade</Uri>
609-
<Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
609+
<Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
610610
</Dependency>
611-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25079.2">
611+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25080.5">
612612
<Uri>https://github.com/dotnet/arcade</Uri>
613-
<Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
613+
<Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
614614
</Dependency>
615-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25079.2">
615+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25080.5">
616616
<Uri>https://github.com/dotnet/arcade</Uri>
617-
<Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
617+
<Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
618618
</Dependency>
619-
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25079.2">
619+
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25080.5">
620620
<Uri>https://github.com/dotnet/arcade</Uri>
621-
<Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
621+
<Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
622622
</Dependency>
623-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25079.2">
623+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25080.5">
624624
<Uri>https://github.com/dotnet/arcade</Uri>
625-
<Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
625+
<Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
626626
</Dependency>
627-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25079.2">
627+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25080.5">
628628
<Uri>https://github.com/dotnet/arcade</Uri>
629-
<Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
629+
<Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
630630
</Dependency>
631631
<!-- Intermediate is necessary for source build. -->
632-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25079.2">
632+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25080.5">
633633
<Uri>https://github.com/dotnet/arcade</Uri>
634-
<Sha>3bb46f96cc988a80a414f45394f8a9ce54b47d3b</Sha>
634+
<Sha>44e60bcd48b52296fdc7d963ecb9e3fa66d2b55b</Sha>
635635
<SourceBuild RepoName="arcade" ManagedOnly="true" />
636636
</Dependency>
637637
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.1.25078.5">

‎eng/Versions.props

+4-4
Original file line numberDiff line numberDiff line change
@@ -271,10 +271,10 @@
271271
</PropertyGroup>
272272
<PropertyGroup>
273273
<!-- Dependencies from https://github.com/dotnet/arcade -->
274-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25079.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
275-
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25079.2</MicrosoftDotNetSignToolVersion>
276-
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25079.2</MicrosoftDotNetXliffTasksVersion>
277-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25079.2</MicrosoftDotNetXUnitExtensionsVersion>
274+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25080.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
275+
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25080.5</MicrosoftDotNetSignToolVersion>
276+
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25080.5</MicrosoftDotNetXliffTasksVersion>
277+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25080.5</MicrosoftDotNetXUnitExtensionsVersion>
278278
</PropertyGroup>
279279
<PropertyGroup>
280280
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25079.2",
21-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25079.2",
20+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25080.5",
21+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25080.5",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

0 commit comments

Comments
 (0)