Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Update dependencies from dotnet/arcade #16241

Merged
merged 32 commits into from
Dec 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
c1fee10
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 8, 2023
41a86a9
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 9, 2023
1fb8c4e
Merge branch 'main' into darc-main-2573404d-155e-48d7-a413-fe0aece4201a
vzarytovskii Nov 9, 2023
713bf3b
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 10, 2023
ff18317
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 11, 2023
41ed56a
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 12, 2023
b705ca5
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 13, 2023
b928330
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 14, 2023
059f4e7
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 15, 2023
8565b19
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 15, 2023
4d98060
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 16, 2023
0b9c74c
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 17, 2023
70f5367
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 18, 2023
93c6f7b
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 19, 2023
dbed01c
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 20, 2023
eeae8fd
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 21, 2023
46fe6df
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 22, 2023
19b83ee
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 23, 2023
d78f05f
Merge branch 'main' into darc-main-2573404d-155e-48d7-a413-fe0aece4201a
T-Gro Nov 24, 2023
d9225f8
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 24, 2023
165aad0
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 25, 2023
8a0080b
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 26, 2023
0b1583e
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 27, 2023
6f9adce
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 28, 2023
c5842b4
Merge branch 'main' into darc-main-2573404d-155e-48d7-a413-fe0aece4201a
vzarytovskii Nov 29, 2023
d10fc9a
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 29, 2023
0fef184
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Nov 30, 2023
37ee01e
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Dec 1, 2023
69a5cb4
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Dec 2, 2023
f18e9af
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Dec 3, 2023
1b18b21
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Dec 4, 2023
84f7c88
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Dec 5, 2023
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
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23463.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23580.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
<Sha>efc3da96e5ac110513e92ebd9ef87c73f44d8540</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23426.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>194f32828726c3f1f63f79f3dc09b9e99c157b11</Sha>
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23515.2">
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@
<XUnitRunnerVersion>2.4.2</XUnitRunnerVersion>
<FluentAssertionsVersion>5.10.3</FluentAssertionsVersion>
<HumanizerCoreVersion>2.2.0</HumanizerCoreVersion>
<MicrosoftDotNetXliffTasksVersion>1.0.0-beta.23426.1</MicrosoftDotNetXliffTasksVersion>
<MicrosoftDotNetXliffTasksVersion>1.0.0-beta.23475.1</MicrosoftDotNetXliffTasksVersion>
<!-- MIBC profile packages -->
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.23515.2</optimizationwindows_ntx64MIBCRuntimeVersion>
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.23515.2</optimizationwindows_ntx86MIBCRuntimeVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/darc-init.ps1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
param (
$darcVersion = $null,
$versionEndpoint = 'https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16',
$versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16',
$verbosity = 'minimal',
$toolpath = $null
)
Expand Down
2 changes: 1 addition & 1 deletion eng/common/darc-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source="${BASH_SOURCE[0]}"
darcVersion=''
versionEndpoint='https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16'
versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16'
verbosity='minimal'

while [[ $# > 0 ]]; do
Expand Down
2 changes: 1 addition & 1 deletion eng/common/post-build/add-build-to-channel.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ param(
[Parameter(Mandatory=$true)][int] $BuildId,
[Parameter(Mandatory=$true)][int] $ChannelId,
[Parameter(Mandatory=$true)][string] $MaestroApiAccessToken,
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com',
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net',
[Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16'
)

Expand Down
2 changes: 1 addition & 1 deletion eng/common/post-build/publish-using-darc.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ param(
[Parameter(Mandatory=$true)][int] $PublishingInfraVersion,
[Parameter(Mandatory=$true)][string] $AzdoToken,
[Parameter(Mandatory=$true)][string] $MaestroToken,
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com',
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net',
[Parameter(Mandatory=$true)][string] $WaitPublishingFinish,
[Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
[Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters
Expand Down
2 changes: 1 addition & 1 deletion eng/common/post-build/trigger-subscriptions.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ param(
[Parameter(Mandatory=$true)][string] $SourceRepo,
[Parameter(Mandatory=$true)][int] $ChannelId,
[Parameter(Mandatory=$true)][string] $MaestroApiAccessToken,
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com',
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net',
[Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16'
)

Expand Down
2 changes: 1 addition & 1 deletion eng/common/sdk-task.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ try {
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
}
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.6.0-2" -MemberType NoteProperty
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.1-2" -MemberType NoteProperty
}
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/job/publish-build-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
/p:BuildAssetRegistryToken=$(MaestroAccessToken)
/p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com
/p:MaestroApiEndpoint=https://maestro.dot.net
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
/p:OfficialBuildId=$(Build.BuildNumber)
condition: ${{ parameters.condition }}
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/post-build/common-variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ variables:

# Default Maestro++ API Endpoint and API Version
- name: MaestroApiEndPoint
value: "https://maestro-prod.westus2.cloudapp.azure.com"
value: "https://maestro.dot.net"
- name: MaestroApiAccessToken
value: $(MaestroAccessToken)
- name: MaestroApiVersion
Expand Down
6 changes: 3 additions & 3 deletions eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -379,13 +379,13 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
}

# Minimum VS version to require.
$vsMinVersionReqdStr = '17.6'
$vsMinVersionReqdStr = '17.7'
$vsMinVersionReqd = [Version]::new($vsMinVersionReqdStr)

# If the version of msbuild is going to be xcopied,
# use this version. Version matches a package here:
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.6.0-2
$defaultXCopyMSBuildVersion = '17.6.0-2'
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.1-2
$defaultXCopyMSBuildVersion = '17.8.1-2'

if (!$vsRequirements) {
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"sdk": {
"version": "8.0.100-rc.1.23463.5",
"version": "8.0.100",
"allowPrerelease": true
},
"tools": {
"dotnet": "8.0.100-rc.1.23463.5",
"dotnet": "8.0.100",
"vs": {
"version": "17.6",
"components": [
Expand All @@ -17,7 +17,7 @@
"perl": "5.38.0.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23463.1",
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23580.1",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2"
}
}