Skip to content

Commit 4c3bd64

Browse files
authored
Merge branch 'main' into parallel-determinism
2 parents 66620d6 + 183ca37 commit 4c3bd64

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

eng/Version.Details.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ This file should be imported by eng/Versions.props
2727
<MicrosoftCodeAnalysisFeaturesPackageVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisFeaturesPackageVersion>
2828
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.0.0-2.25480.7</MicrosoftVisualStudioLanguageServicesPackageVersion>
2929
<!-- dotnet/arcade dependencies -->
30-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25555.5</MicrosoftDotNetArcadeSdkPackageVersion>
30+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25556.3</MicrosoftDotNetArcadeSdkPackageVersion>
3131
<!-- _git/dotnet-optimization dependencies -->
3232
<optimizationlinuxarm64MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationlinuxarm64MIBCRuntimePackageVersion>
3333
<optimizationlinuxx64MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationlinuxx64MIBCRuntimePackageVersion>

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@
7676
</Dependency>
7777
</ProductDependencies>
7878
<ToolsetDependencies>
79-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25555.5">
79+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25556.3">
8080
<Uri>https://github.com/dotnet/arcade</Uri>
81-
<Sha>86c3a198a81e697e2bfa713cae2c4bea4b0df085</Sha>
81+
<Sha>36fa2ff1495d2b55b5cb9e2a42514d94c6af10b9</Sha>
8282
</Dependency>
8383
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25502.1">
8484
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ jobs:
140140
/p:MaestroApiEndpoint=https://maestro.dot.net
141141
/p:OfficialBuildId=$(OfficialBuildId)
142142
-runtimeSourceFeed https://ci.dot.net/internal
143-
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
143+
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
144144

145145
condition: ${{ parameters.condition }}
146146
continueOnError: ${{ parameters.continueOnError }}
@@ -210,8 +210,8 @@ jobs:
210210
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
211211
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
212212
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
213-
-runtimeSourceFeed https://ci.dot.net/internal
214-
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
213+
-runtimeSourceFeed https://ci.dot.net/internal
214+
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
215215
216216
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
217217
- template: /eng/common/core-templates/steps/publish-logs.yml

eng/common/core-templates/post-build/post-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,4 +334,4 @@ stages:
334334
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
335335
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
336336
-runtimeSourceFeed https://ci.dot.net/internal
337-
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
337+
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'

eng/common/core-templates/steps/publish-logs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ steps:
2626
# If the file exists - sensitive data for redaction will be sourced from it
2727
# (single entry per line, lines starting with '# ' are considered comments and skipped)
2828
arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs'
29-
-BinlogToolVersion ${{parameters.BinlogToolVersion}}
29+
-BinlogToolVersion '${{parameters.BinlogToolVersion}}'
3030
-TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt'
3131
-runtimeSourceFeed https://ci.dot.net/internal
32-
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
32+
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
3333
'$(publishing-dnceng-devdiv-code-r-build-re)'
3434
'$(MaestroAccessToken)'
3535
'$(dn-bot-all-orgs-artifact-feeds-rw)'

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"perl": "5.38.2.2"
2323
},
2424
"msbuild-sdks": {
25-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25555.5",
25+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25556.3",
2626
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2"
2727
}
2828
}

0 commit comments

Comments
 (0)