Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25528.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25554.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d78e0e9d17ca041656652ef10b8f5cb4f1f42475</Sha>
<Sha>9b521bdb03239f91830fb39a6ee2bf23bba07989</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="11.0.0-beta.25528.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="11.0.0-beta.25554.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d78e0e9d17ca041656652ef10b8f5cb4f1f42475</Sha>
<Sha>9b521bdb03239f91830fb39a6ee2bf23bba07989</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="11.0.0-beta.25528.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="11.0.0-beta.25554.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d78e0e9d17ca041656652ef10b8f5cb4f1f42475</Sha>
<Sha>9b521bdb03239f91830fb39a6ee2bf23bba07989</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.25528.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.25554.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d78e0e9d17ca041656652ef10b8f5cb4f1f42475</Sha>
<Sha>9b521bdb03239f91830fb39a6ee2bf23bba07989</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
9 changes: 5 additions & 4 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
<!--<PackageValidationBaselineVersion>$(MajorVersion).$(MinorVersion).$([MSBuild]::Subtract($(PatchVersion), 1))</PackageValidationBaselineVersion>-->
<!-- To produce shipping versions in non-official builds, instead of default fixed dummy version number (42.42.42.42). -->
<DotNetUseShippingVersions>true</DotNetUseShippingVersions>
<PreReleaseVersionLabel></PreReleaseVersionLabel>
<PreReleaseVersionLabel>
</PreReleaseVersionLabel>
<PreReleaseVersionIteration>
</PreReleaseVersionIteration>
<!-- Opt-in repo features -->
Expand All @@ -22,9 +23,9 @@
</PropertyGroup>
<!-- Arcade dependencies -->
<PropertyGroup>
<MicrosoftDotNetGenFacadesPackageVersion>11.0.0-beta.25528.1</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>11.0.0-beta.25528.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.25528.1</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>11.0.0-beta.25554.2</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>11.0.0-beta.25554.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.25554.2</MicrosoftDotNetGenAPIPackageVersion>
</PropertyGroup>
<!-- Additional dependencies -->
<PropertyGroup>
Expand Down
5 changes: 5 additions & 0 deletions eng/common/core-templates/job/publish-build-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,11 @@ jobs:
BARBuildId: ${{ parameters.BARBuildId }}
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
is1ESPipeline: ${{ parameters.is1ESPipeline }}

# Darc is targeting 8.0, so make sure it's installed
- task: UseDotNet@2
inputs:
version: 8.0.x

- task: AzureCLI@2
displayName: Publish Using Darc
Expand Down
4 changes: 4 additions & 0 deletions eng/common/core-templates/post-build/post-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,10 @@ stages:

- template: /eng/common/templates/steps/enable-internal-runtimes.yml

- task: UseDotNet@2
inputs:
version: 8.0.x

- task: AzureCLI@2
displayName: Publish Using Darc
inputs:
Expand Down
6 changes: 3 additions & 3 deletions eng/common/core-templates/steps/install-microbuild-impl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ parameters:
steps:
- ${{ if eq(parameters.enablePreviewMicrobuild, 'true') }}:
- task: MicroBuildSigningPluginPreview@4
displayName: Install Preview MicroBuild plugin (Windows)
displayName: Install Preview MicroBuild plugin
inputs: ${{ parameters.microbuildTaskInputs }}
env: ${{ parameters.microbuildEnv }}
continueOnError: ${{ parameters.continueOnError }}
condition: ${{ parameters.condition }}
- ${{ else }}:
- task: MicroBuildSigningPlugin@4
displayName: Install MicroBuild plugin (Windows)
displayName: Install MicroBuild plugin
inputs: ${{ parameters.microbuildTaskInputs }}
env: ${{ parameters.microbuildEnv }}
continueOnError: ${{ parameters.continueOnError }}
condition: ${{ parameters.condition }}
condition: ${{ parameters.condition }}
2 changes: 2 additions & 0 deletions eng/common/core-templates/steps/publish-logs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ steps:
arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs'
-BinlogToolVersion ${{parameters.BinlogToolVersion}}
-TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt'
-runtimeSourceFeed https://ci.dot.net/internal
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
'$(publishing-dnceng-devdiv-code-r-build-re)'
'$(MaestroAccessToken)'
'$(dn-bot-all-orgs-artifact-feeds-rw)'
Expand Down
4 changes: 3 additions & 1 deletion eng/common/post-build/redact-logs.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ param(
# File with strings to redact - separated by newlines.
# For comments start the line with '# ' - such lines are ignored
[Parameter(Mandatory=$false)][string] $TokensFilePath,
[Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact
[Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact,
[Parameter(Mandatory=$false)][string] $runtimeSourceFeed,
[Parameter(Mandatory=$false)][string] $runtimeSourceFeedKey
)

try {
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": "10.0.100-rc.2.25502.107"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25528.1",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25554.2",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5"
}
}