Skip to content

Commit 8b4cb21

Browse files
dotnet-maestro[bot]radekdoulik
authored andcommitted
Update dependencies from https://github.com/dotnet/arcade build 20240710.4 (#595)
[dotnet/main-16.x] Update dependencies from dotnet/arcade
1 parent c96e1a0 commit 8b4cb21

File tree

5 files changed

+16
-35
lines changed

5 files changed

+16
-35
lines changed

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24352.2">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24360.4">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>4a7d983f833d6b86365ea1b2b4d6ee72fbdbf944</Sha>
13+
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
1414
</Dependency>
1515
<!-- Intermediate is necessary for source build. -->
16-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24352.2">
16+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24360.4">
1717
<Uri>https://github.com/dotnet/arcade</Uri>
18-
<Sha>4a7d983f833d6b86365ea1b2b4d6ee72fbdbf944</Sha>
18+
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
1919
<SourceBuild RepoName="arcade" ManagedOnly="true" />
2020
</Dependency>
21-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24352.2">
21+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24360.4">
2222
<Uri>https://github.com/dotnet/arcade</Uri>
23-
<Sha>4a7d983f833d6b86365ea1b2b4d6ee72fbdbf944</Sha>
23+
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24352.2">
25+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24360.4">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>4a7d983f833d6b86365ea1b2b4d6ee72fbdbf944</Sha>
27+
<Sha>731d793be2d0a66bafc96b1a79dc96b4d1f0301b</Sha>
2828
</Dependency>
2929
</ToolsetDependencies>
3030
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
77
</PropertyGroup>
88
<PropertyGroup>
9-
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24352.2</MicrosoftDotNetBuildTasksPackagingVersion>
9+
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24360.4</MicrosoftDotNetBuildTasksPackagingVersion>
1010
</PropertyGroup>
1111
</Project>

eng/common/core-templates/job/publish-build-assets.yml

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -113,38 +113,19 @@ jobs:
113113
Add-Content -Path $filePath -Value "$(DefaultChannels)"
114114
Add-Content -Path $filePath -Value $(IsStableBuild)
115115
116-
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
117-
parameters:
118-
is1ESPipeline: ${{ parameters.is1ESPipeline }}
119-
args:
120-
displayName: Publish ReleaseConfigs Artifact
121-
pathToPublish: '$(Build.StagingDirectory)/ReleaseConfigs'
122-
publishLocation: Container
123-
artifactName: ReleaseConfigs
124-
125-
- task: powershell@2
126-
displayName: Check if SymbolPublishingExclusionsFile.txt exists
127-
inputs:
128-
targetType: inline
129-
script: |
130116
$symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt"
131-
if(Test-Path -Path $symbolExclusionfile)
117+
if (Test-Path -Path $symbolExclusionfile)
132118
{
133119
Write-Host "SymbolExclusionFile exists"
134-
Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]true"
135-
}
136-
else{
137-
Write-Host "Symbols Exclusion file does not exist"
138-
Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]false"
120+
Copy-Item -Path $symbolExclusionfile -Destination "$(Build.StagingDirectory)/ReleaseConfigs"
139121
}
140122
141123
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
142124
parameters:
143125
is1ESPipeline: ${{ parameters.is1ESPipeline }}
144126
args:
145-
displayName: Publish SymbolPublishingExclusionsFile Artifact
146-
condition: eq(variables['SymbolExclusionFile'], 'true')
147-
pathToPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
127+
displayName: Publish ReleaseConfigs Artifact
128+
pathToPublish: '$(Build.StagingDirectory)/ReleaseConfigs'
148129
publishLocation: Container
149130
artifactName: ReleaseConfigs
150131

eng/common/cross/build-rootfs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ __AlpinePackages+=" krb5-dev"
7272
__AlpinePackages+=" openssl-dev"
7373
__AlpinePackages+=" zlib-dev"
7474

75-
__FreeBSDBase="13.2-RELEASE"
75+
__FreeBSDBase="13.3-RELEASE"
7676
__FreeBSDPkg="1.17.0"
7777
__FreeBSDABI="13"
7878
__FreeBSDPackages="libunwind"

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"dotnet": "9.0.100-preview.5.24307.3"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24352.2",
7-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24352.2",
6+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24360.4",
7+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24360.4",
88
"Microsoft.Build.Traversal": "3.4.0"
99
}
1010
}

0 commit comments

Comments
 (0)