Skip to content

Commit 5edc884

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#4963)
[main] Update dependencies from dotnet/arcade
1 parent 36b15db commit 5edc884

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

‎eng/Version.Details.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -152,29 +152,29 @@
152152
</Dependency>
153153
</ProductDependencies>
154154
<ToolsetDependencies>
155-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25157.1">
155+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25160.4">
156156
<Uri>https://github.com/dotnet/arcade</Uri>
157-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
157+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
158158
</Dependency>
159-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25157.1">
159+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25160.4">
160160
<Uri>https://github.com/dotnet/arcade</Uri>
161-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
161+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
162162
</Dependency>
163-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25157.1">
163+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25160.4">
164164
<Uri>https://github.com/dotnet/arcade</Uri>
165-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
165+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
166166
</Dependency>
167-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25157.1">
167+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25160.4">
168168
<Uri>https://github.com/dotnet/arcade</Uri>
169-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
169+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
170170
</Dependency>
171-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25157.1">
171+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25160.4">
172172
<Uri>https://github.com/dotnet/arcade</Uri>
173-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
173+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
174174
</Dependency>
175-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25157.1">
175+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25160.4">
176176
<Uri>https://github.com/dotnet/arcade</Uri>
177-
<Sha>1ec6078c26e4a60b77d8fe64881491cd28335a08</Sha>
177+
<Sha>ff649d8e03e3463b5af6dddad0016e904048990a</Sha>
178178
</Dependency>
179179
</ToolsetDependencies>
180180
</Dependencies>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
</PropertyGroup>
1212
<PropertyGroup>
1313
<!-- arcade -->
14-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25157.1</MicrosoftDotNetBuildTasksArchivesVersion>
15-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25157.1</MicrosoftDotNetBuildTasksInstallersVersion>
14+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25160.4</MicrosoftDotNetBuildTasksArchivesVersion>
15+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25160.4</MicrosoftDotNetBuildTasksInstallersVersion>
1616
<!-- corefx -->
1717
<SystemDataDataSetExtensionsVersion>4.5.0</SystemDataDataSetExtensionsVersion>
1818
<!-- The SQL team had deprecated System.Data.SqlClient package and replaced it with Microsoft.Data.SqlClient.

‎eng/common/native/install-dependencies.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ case "$os" in
4545
export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
4646
# Skip brew update for now, see https://github.com/actions/setup-python/issues/577
4747
# brew update --preinstall
48-
brew bundle --no-upgrade --no-lock --file=- <<EOF
48+
brew bundle --no-upgrade --file=- <<EOF
4949
brew "cmake"
5050
brew "icu4c"
5151
brew "openssl@3"

‎eng/common/templates-official/job/job.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
displayName: Publish Logs
4747
PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
4848
publishLocation: Container
49-
ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
49+
ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)' ) }}
5050
continueOnError: true
5151
condition: always()
5252
sbomEnabled: false # we don't need SBOM for logs

‎eng/common/templates/job/job.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
displayName: Publish Logs
6767
pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)'
6868
publishLocation: Container
69-
artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }}
69+
artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)' ) }}
7070
continueOnError: true
7171
condition: always()
7272

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
}
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25157.1",
12-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25157.1",
11+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25160.4",
12+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25160.4",
1313
"Microsoft.Build.NoTargets": "3.7.0",
1414
"Microsoft.Build.Traversal": "3.4.0"
1515
}

0 commit comments

Comments
 (0)