Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/arcade (#196)
Browse files Browse the repository at this point in the history
* Update dependencies from https://github.com/dotnet/arcade build 20250114.11

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25060.1 -> To Version 8.0.0-beta.25064.11

* Update dependencies from https://github.com/dotnet/arcade build 20250116.6

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25060.1 -> To Version 8.0.0-beta.25066.6

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
  • Loading branch information
dotnet-maestro[bot] and dotnet-maestro[bot] authored Jan 17, 2025
1 parent 6f3ff02 commit 3bad0e4
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25060.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25066.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
<Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25060.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25066.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
<Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25060.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25066.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
<Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.25060.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.25066.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c255aae7f2b128fa20a4441f0e192c3c53561621</Sha>
<Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Arcade dependencies -->
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25060.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25060.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.25060.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25066.6</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25066.6</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.25066.6</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
</PropertyGroup>
</Project>
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.8.1-2" -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
4 changes: 2 additions & 2 deletions eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -384,8 +384,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/RoslynTools.MSBuild/versions/17.8.1-2
$defaultXCopyMSBuildVersion = '17.8.1-2'
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.12.0
$defaultXCopyMSBuildVersion = '17.12.0'

if (!$vsRequirements) {
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25060.1",
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25066.6",
"Microsoft.NET.Sdk.IL": "8.0.0"
}
}

0 comments on commit 3bad0e4

Please sign in to comment.