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.

Sign up for GitHub

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

Jump to bottom

[main] Update dependencies from dotnet/arcade #6708

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+31 −31
Open

[main] Update dependencies from dotnet/arcade #6708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96fe50e
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 18, 2024
8d601fd
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Nov 25, 2024
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
36 changes: 18 additions & 18 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,42 +145,42 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24516.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24572.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24516.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24572.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24516.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24572.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24516.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24572.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24516.2">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24572.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24516.2">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24572.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24516.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24572.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24516.2">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24572.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24516.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24572.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3c393bbd85ae16ddddba20d0b75035b0c6f1a52d</Sha>
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
<MicrosoftDeveloperControlPlanewindowsamd64PackageVersion>0.9.0</MicrosoftDeveloperControlPlanewindowsamd64PackageVersion>
<MicrosoftDeveloperControlPlanewindowsarm64PackageVersion>0.9.0</MicrosoftDeveloperControlPlanewindowsarm64PackageVersion>
<!-- Other -->
<MicrosoftDotNetRemoteExecutorPackageVersion>9.0.0-beta.24516.2</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.24516.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24516.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24516.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>9.0.0-beta.24572.2</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.24572.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24572.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24572.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftExtensionsHttpResiliencePackageVersion>9.0.0</MicrosoftExtensionsHttpResiliencePackageVersion>
<MicrosoftExtensionsDiagnosticsTestingPackageVersion>9.0.0</MicrosoftExtensionsDiagnosticsTestingPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>8.0.0</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/sdk-task.ps1
View file
Open in desktop
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.10.0-pre.4.0" -MemberType NoteProperty
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -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/template-guidance.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

Note: Multiple outputs are ONLY applicable to 1ES PT publishing (only usable when referencing `templates-official`).

## Development notes
# Development notes

Check failure on line 60 in eng/common/template-guidance.md

View workflow job for this annotation

GitHub Actions / lint 

Multiple top-level headings in the same document [Context: "Development notes"]

**Folder / file structure**

Expand Down
4 changes: 2 additions & 2 deletions eng/common/tools.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =

# 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/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.10.0-pre.4.0
$defaultXCopyMSBuildVersion = '17.10.0-pre.4.0'
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0
$defaultXCopyMSBuildVersion = '17.12.0'

if (!$vsRequirements) {
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
Expand Down
10 changes: 5 additions & 5 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"sdk": {
"version": "9.0.100-rc.2.24474.11",
"version": "9.0.100",
"rollForward": "major",
"allowPrerelease": true
},
"tools": {
"dotnet": "9.0.100-rc.2.24474.11",
"dotnet": "9.0.100",
"runtimes": {
"dotnet/x64": [
"$(DotNetRuntimePreviousVersionForTesting)"
Expand All @@ -22,9 +22,9 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24516.2",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24516.2",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24516.2",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24572.2",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24572.2",
"Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24572.2",
"Microsoft.Build.NoTargets": "3.7.0"
}
}
Loading