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
76 changes: 38 additions & 38 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,77 +26,77 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24163.13">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
<Uri>https://github.com/microsoft/vstest</Uri>
Expand Down Expand Up @@ -222,9 +222,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>e3f823d9e7dd5b42dde2fc3cdc1fb3650dd197f2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21416.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
30 changes: 15 additions & 15 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,21 @@
<!-- SDK dependencies -->
<MicrosoftDotNetCompatibilityVersion>1.1.0-preview.22164.17</MicrosoftDotNetCompatibilityVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.24163.13</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.24163.13</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.24163.13</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.24163.13</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.24163.13</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24163.13</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24163.13</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.24163.13</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24163.13</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.24163.13</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24163.13</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.24163.13</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.24163.13</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.24163.13</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.24163.13</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.24204.4</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.24204.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.24204.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.24204.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.24204.4</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.24204.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24204.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.24204.4</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24204.4</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.24204.4</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24204.4</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.24204.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.24204.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.24204.4</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.24204.4</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
3 changes: 2 additions & 1 deletion eng/common/templates-official/job/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,14 +116,15 @@ jobs:

- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- task: MicroBuildSigningPlugin@3
- task: MicroBuildSigningPlugin@4
displayName: Install MicroBuild plugin
inputs:
signType: $(_SignType)
zipSources: false
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
env:
TeamName: $(_TeamName)
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
continueOnError: ${{ parameters.continueOnError }}
condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))

Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates-official/job/onelocbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Svc-Internal
image: 1es-windows-2022-pt
image: 1es-windows-2022
os: windows

variables:
Expand Down
10 changes: 6 additions & 4 deletions eng/common/templates-official/job/publish-build-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,16 @@ jobs:
inputs:
targetType: inline
script: |
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId)
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)"
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild)
New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force
$filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt"
Add-Content -Path $filePath -Value $(BARBuildId)
Add-Content -Path $filePath -Value "$(DefaultChannels)"
Add-Content -Path $filePath -Value $(IsStableBuild)

- task: 1ES.PublishBuildArtifacts@1
displayName: Publish ReleaseConfigs Artifact
inputs:
PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt'
PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs'
PublishLocation: Container
ArtifactName: ReleaseConfigs

Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates-official/job/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Svc-Internal
image: 1es-mariner-2-pt
image: 1es-mariner-2
os: linux
${{ if ne(parameters.platform.pool, '') }}:
pool: ${{ parameters.platform.pool }}
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates-official/job/source-index-stage1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ parameters:
binlogPath: artifacts/log/Debug/Build.binlog
pool:
name: NetCore1ESPool-Svc-Internal
image: 1es-windows-2022-pt
image: 1es-windows-2022
os: windows
condition: ''
dependsOn: ''
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates-official/jobs/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
# If it's not devdiv, it's dnceng
${{ else }}:
name: NetCore1ESPool-Svc-Internal
image: 1es-windows-2022-pt
image: 1es-windows-2022
os: windows

runAsPublic: ${{ parameters.runAsPublic }}
Expand Down
10 changes: 6 additions & 4 deletions eng/common/templates-official/post-build/post-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ stages:
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Svc-Internal
image: 1es-windows-2022-pt
image: 1es-windows-2022
os: windows

steps:
Expand Down Expand Up @@ -137,12 +137,13 @@ stages:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
name: AzurePipelines-EO
image: 1ESPT-Windows2022
demands: Cmd
os: windows
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Svc-Internal
image: 1es-windows-2022-pt
image: 1es-windows-2022
os: windows
steps:
- template: setup-maestro-vars.yml
Expand Down Expand Up @@ -205,7 +206,7 @@ stages:
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Svc-Internal
image: 1es-windows-2022-pt
image: 1es-windows-2022
os: windows
steps:
- template: setup-maestro-vars.yml
Expand Down Expand Up @@ -251,12 +252,13 @@ stages:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
name: AzurePipelines-EO
image: 1ESPT-Windows2022
demands: Cmd
os: windows
# If it's not devdiv, it's dnceng
${{ else }}:
name: NetCore1ESPool-Svc-Internal
image: 1es-windows-2022-pt
image: 1es-windows-2022
os: windows
steps:
- template: setup-maestro-vars.yml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ parameters:

steps:
- ${{ if eq(parameters.disableComponentGovernance, 'true') }}:
- script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
- script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
displayName: Set skipComponentGovernanceDetection variable
- ${{ if ne(parameters.disableComponentGovernance, 'true') }}:
- task: ComponentGovernanceComponentDetection@0
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/steps/component-governance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ parameters:

steps:
- ${{ if eq(parameters.disableComponentGovernance, 'true') }}:
- script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
- script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true"
displayName: Set skipComponentGovernanceDetection variable
- ${{ if ne(parameters.disableComponentGovernance, 'true') }}:
- task: ComponentGovernanceComponentDetection@0
Expand Down
8 changes: 4 additions & 4 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
"python3": "3.7.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.24163.13",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24163.13",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24163.13",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.24163.13",
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.24204.4",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24204.4",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24204.4",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.24204.4",
"Microsoft.Build.NoTargets": "3.1.0",
"Microsoft.Build.Traversal": "3.0.23",
"Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6"
Expand Down