Skip to content
Closed
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
2 changes: 1 addition & 1 deletion src/arcade/azure-pipelines-unofficial.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ extends:
parameters:
pool:
name: $(DncEngInternalBuildPool)
image: windows.vs2019.amd64
image: windows.vs2022.amd64
os: windows

stages:
Expand Down
4 changes: 3 additions & 1 deletion src/arcade/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,11 @@ resources:
extends:
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
parameters:
settings:
networkIsolationPolicy: Permissive, CFSClean, CFSClean2
pool:
name: $(DncEngInternalBuildPool)
image: windows.vs2019.amd64
image: windows.vs2022.amd64
os: windows
sdl:
policheck:
Expand Down
4 changes: 2 additions & 2 deletions src/arcade/eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ This file should be imported by eng/Versions.props
<!-- dotnet/templating dependencies -->
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.100-preview.4.25220.1</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<!-- dotnet/arcade dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25608.3</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25608.3</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26080.4</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26080.4</MicrosoftDotNetHelixSdkPackageVersion>
<!-- dotnet/arcade-services dependencies -->
<MicrosoftDotNetDarcLibPackageVersion>1.1.0-beta.25424.1</MicrosoftDotNetDarcLibPackageVersion>
<MicrosoftDotNetProductConstructionServiceClientPackageVersion>1.1.0-beta.25424.1</MicrosoftDotNetProductConstructionServiceClientPackageVersion>
Expand Down
12 changes: 6 additions & 6 deletions src/arcade/eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="arcade" Sha="20abd87658f89b288b8beeb3a0fcb2c89b0af69a" BarId="292473" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="arcade" Sha="b6995982889aca81f3e8a3e1406629e1f379b31f" BarId="295588" />
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
Expand All @@ -20,13 +20,13 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>43b5827697e501c442eb75ffff832cd4df2514fe</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25608.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26080.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6605fb5db42d56000a040ed7a0736bc505be9743</Sha>
<Sha>b0f891cf7c1febc0ebbae7dd787f8a0b4c0cbc95</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25608.3">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26080.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6605fb5db42d56000a040ed7a0736bc505be9743</Sha>
<Sha>b0f891cf7c1febc0ebbae7dd787f8a0b4c0cbc95</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ProductConstructionService.Client" Version="1.1.0-beta.25424.1">
<Uri>https://github.com/dotnet/arcade-services</Uri>
Expand Down Expand Up @@ -174,4 +174,4 @@
<Sha>0a2e291c0d9c0c7675d445703e51750363a549ef</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
</Dependencies>
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Publishing-Internal
image: windows.vs2019.amd64
image: windows.vs2022.amd64
os: windows
steps:
- ${{ if eq(parameters.is1ESPipeline, '') }}:
Expand Down
8 changes: 4 additions & 4 deletions src/arcade/eng/common/core-templates/job/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,19 +60,19 @@ jobs:
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
demands: ImageOverride -equals build.ubuntu.2004.amd64
demands: ImageOverride -equals build.azurelinux.3.amd64.open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
image: 1es-mariner-2
image: build.azurelinux.3.amd64
os: linux
${{ else }}:
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
demands: ImageOverride -equals build.azurelinux.3.amd64.open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64
demands: ImageOverride -equals build.azurelinux.3.amd64
${{ if ne(parameters.platform.pool, '') }}:
pool: ${{ parameters.platform.pool }}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -293,11 +293,11 @@ stages:
${{ else }}:
${{ if eq(parameters.is1ESPipeline, true) }}:
name: NetCore1ESPool-Publishing-Internal
image: windows.vs2019.amd64
image: windows.vs2022.amd64
os: windows
${{ else }}:
name: NetCore1ESPool-Publishing-Internal
demands: ImageOverride -equals windows.vs2019.amd64
demands: ImageOverride -equals windows.vs2022.amd64
steps:
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
parameters:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#
# pool:
# name: $(DncEngInternalBuildPool)
# demands: ImageOverride -equals windows.vs2019.amd64
# demands: ImageOverride -equals windows.vs2022.amd64
variables:
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- template: /eng/common/templates-official/variables/pool-providers.yml
Expand Down
13 changes: 10 additions & 3 deletions src/arcade/eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -560,19 +560,26 @@ function LocateVisualStudio([object]$vsRequirements = $null){
})
}

if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
if (!$vsRequirements) {
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) {
$vsRequirements = $GlobalJson.tools.vs
} else {
$vsRequirements = $null
}
}

$args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*')

if (!$excludePrereleaseVS) {
$args += '-prerelease'
}

if (Get-Member -InputObject $vsRequirements -Name 'version') {
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) {
$args += '-version'
$args += $vsRequirements.version
}

if (Get-Member -InputObject $vsRequirements -Name 'components') {
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) {
foreach ($component in $vsRequirements.components) {
$args += '-requires'
$args += $component
Expand Down
2 changes: 1 addition & 1 deletion src/arcade/eng/promote-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ extends:
os: windows
${{ else }}:
name: NetCore1ESPool-Publishing-Internal
image: windows.vs2019.amd64
image: windows.vs2022.amd64
os: windows
sdl:
policheck:
Expand Down
2 changes: 1 addition & 1 deletion src/arcade/eng/validate-sdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- template: /eng/common/templates-official/variables/pool-providers.yml@self
pool:
name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals windows.vs2019.amd64
demands: ImageOverride -equals windows.vs2022.amd64
preSteps:
- checkout: self
clean: true
Expand Down
8 changes: 4 additions & 4 deletions src/arcade/global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "10.0.100",
"version": "10.0.101",
"rollForward": "latestFeature",
"paths": [
".dotnet",
Expand All @@ -9,11 +9,11 @@
"errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it."
},
"tools": {
"dotnet": "10.0.100"
"dotnet": "10.0.101"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25608.3",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25608.3",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26080.4",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26080.4",
"Microsoft.Build.NoTargets": "3.7.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<CertificatesSignInfo Include="MacDeveloperVNextHardenWithNotarization" MacCertificate="MacDeveloperVNextHarden" MacNotarizationAppName="dotnet" />
<!-- Certificates Which support detached signatures -->
<CertificatesSignInfo Include="LinuxSignTar" SupportsDetachedSignature="true" />
<CertificatesSignInfo Include="LinuxSign500180PGP" SupportsDetachedSignature="true" />
</ItemGroup>

<!-- Only publish packages that contain this build's Target RID in the name.
Expand Down
Loading
Loading