Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/arcade (#5082)
Browse files Browse the repository at this point in the history
[main] Update dependencies from dotnet/arcade


 - Update Microsoft.Testing.Platform.MSBuild.csproj
  • Loading branch information
dotnet-maestro[bot] authored Feb 21, 2025
1 parent 6c0b15f commit f0167dd
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25119.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25119.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25119.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
</Dependency>
<Dependency Name="Microsoft.Testing.Extensions.CodeCoverage" Version="17.14.2-preview.25118.1">
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
</PropertyGroup>
<PropertyGroup Label="MSTest prod dependencies - darc updated">
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25113.2</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25119.2</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftTestingExtensionsCodeCoverageVersion>17.14.2-preview.25118.1</MicrosoftTestingExtensionsCodeCoverageVersion>
</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.12.0" -MemberType NoteProperty
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.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 @@ -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.12.0
$defaultXCopyMSBuildVersion = '17.12.0'
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.13.0
$defaultXCopyMSBuildVersion = '17.13.0'

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,6 +1,6 @@
{
"tools": {
"dotnet": "10.0.100-alpha.1.25077.2",
"dotnet": "10.0.100-preview.2.25118.3",
"runtimes": {
"dotnet": [
"3.1.32",
Expand All @@ -21,12 +21,12 @@
}
},
"sdk": {
"version": "10.0.100-alpha.1.25077.2",
"version": "10.0.100-preview.2.25118.3",
"allowPrerelease": true,
"rollForward": "latestFeature"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25113.2",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25119.2",
"MSBuild.Sdk.Extras": "3.0.44"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Build.Framework" PrivateAssets="All" />
<PackageReference Include="Microsoft.Build.Utilities.Core" PrivateAssets="All" />
<PackageReference Include="Microsoft.Win32.Registry" PrivateAssets="All" />
<PackageReference Include="Microsoft.Win32.Registry" PrivateAssets="All" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
</ItemGroup>

<ItemGroup>
Expand Down Expand Up @@ -95,4 +95,4 @@ This package provides MSBuild integration of the platform, its extensions and co
<Using Include="Polyfills" />
</ItemGroup>

</Project>
</Project>

0 comments on commit f0167dd

Please sign in to comment.