Skip to content
Merged
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
12 changes: 6 additions & 6 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftBuildPackageVersion>18.1.0-preview-25555-103</MicrosoftBuildPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>18.1.0-preview-25555-103</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25555.103</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-rc.2.25555.103</MicrosoftDotNetGenAPITaskPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.1.25555.103</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-rc.1.25555.103</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftBuildPackageVersion>18.1.0-preview-25556-111</MicrosoftBuildPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>18.1.0-preview-25556-111</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25556.111</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-rc.3.25556.111</MicrosoftDotNetGenAPITaskPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.3.25556.111</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-rc.3.25556.111</MicrosoftNETCoreILDAsmPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down
26 changes: 13 additions & 13 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="54c879632fdf0197d517d80e4b90861e2bd5d03e" BarId="289655" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="77ee357638bcd8fa66a1c16fa588dcd5818068d2" BarId="289869" />
<ToolsetDependencies>
<Dependency Name="Microsoft.Build" Version="18.1.0-preview-25555-103">
<Dependency Name="Microsoft.Build" Version="18.1.0-preview-25556-111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.1.0-preview-25555-103">
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.1.0-preview-25556-111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25555.103">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25556.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-rc.2.25555.103">
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-rc.3.25556.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-rc.1.25555.103">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-rc.3.25556.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-rc.1.25555.103">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-rc.3.25556.111">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>54c879632fdf0197d517d80e4b90861e2bd5d03e</Sha>
<Sha>77ee357638bcd8fa66a1c16fa588dcd5818068d2</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
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 }}
15 changes: 8 additions & 7 deletions eng/common/core-templates/steps/install-microbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ parameters:
# Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The
# variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough.
microbuildUseESRP: true
# Location of the MicroBuild output folder
# NOTE: There's something that relies on this being in the "default" source directory for tasks such as Signing to work properly.
microBuildOutputFolder: '$(Build.SourcesDirectory)'
# Microbuild version
microbuildPluginVersion: 'latest'

Expand All @@ -21,16 +24,14 @@ parameters:
steps:
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
# Installing .NET 8 is required to use the MicroBuild signing plugin on non-Windows platforms
# Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable
- task: UseDotNet@2
displayName: Install .NET 8.0 SDK for MicroBuild Plugin
inputs:
packageType: sdk
version: 8.0.x
# Installing the SDK in a '.dotnet-microbuild' directory is required for signing.
# See target FindDotNetPathForMicroBuild in arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj
# Do not remove '.dotnet-microbuild' from the path without changing the corresponding logic.
installationPath: $(Agent.TempDirectory)/.dotnet-microbuild
installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet
workingDirectory: ${{ parameters.microBuildOutputFolder }}
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))

- script: |
Expand Down Expand Up @@ -70,7 +71,7 @@ steps:
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
microbuildEnv:
TeamName: $(_TeamName)
MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
continueOnError: ${{ parameters.continueOnError }}
condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test'))
Expand All @@ -92,7 +93,7 @@ steps:
ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc
microbuildEnv:
TeamName: $(_TeamName)
MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
continueOnError: ${{ parameters.continueOnError }}
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real'))
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25555.103"
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25556.111"
}
}