Skip to content

Commit ff21cc5

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#6451)
* Update dependencies from https://github.com/dotnet/arcade build 20221111.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.22558.4 -> To Version 7.0.0-beta.22561.2 * Update dependencies from https://github.com/dotnet/arcade build 20221122.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.22558.4 -> To Version 7.0.0-beta.22572.6 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent b1cb564 commit ff21cc5

File tree

6 files changed

+25
-18
lines changed

6 files changed

+25
-18
lines changed

‎eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@
77
</Dependency>
88
</ProductDependencies>
99
<ToolsetDependencies>
10-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22558.4">
10+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22572.6">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
12+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22558.4">
14+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22572.6">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
16+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
1717
</Dependency>
18-
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.22558.4">
18+
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.22572.6">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
20+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22558.4">
22+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22572.6">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
24+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
2525
</Dependency>
26-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.22558.4">
26+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.22572.6">
2727
<Uri>https://github.com/dotnet/arcade</Uri>
28-
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
28+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
2929
</Dependency>
3030
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20074.1">
3131
<Uri>https://github.com/dotnet/arcade-services</Uri>
@@ -39,9 +39,9 @@
3939
<Uri>https://github.com/dotnet/xharness</Uri>
4040
<Sha>89cb4b1d368e0f15b4df8e02a176dd1f1c33958b</Sha>
4141
</Dependency>
42-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22558.4">
42+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22572.6">
4343
<Uri>https://github.com/dotnet/arcade</Uri>
44-
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
44+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
4545
</Dependency>
4646
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-3.20460.2">
4747
<Uri>https://github.com/dotnet/roslyn</Uri>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<DotNetRuntime60Version>6.0.9</DotNetRuntime60Version>
6767
<FluentAssertionVersion>5.10.2</FluentAssertionVersion>
6868
<MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.22512.1</MicrosoftCodeAnalysisTestingVersion>
69-
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22558.4</MicrosoftDotNetXUnitExtensionsVersion>
69+
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22572.6</MicrosoftDotNetXUnitExtensionsVersion>
7070
<MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
7171
<MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
7272
<MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>

‎eng/common/cross/toolchain.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
set(CROSS_ROOTFS $ENV{ROOTFS_DIR})
22

3+
# reset platform variables (e.g. cmake 3.25 sets LINUX=1)
4+
unset(LINUX)
5+
unset(FREEBSD)
6+
unset(ILLUMOS)
7+
unset(ANDROID)
8+
unset(TIZEN)
9+
310
set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH})
411
if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version)
512
set(CMAKE_SYSTEM_NAME FreeBSD)

‎eng/common/sdk-task.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ try {
6464
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
6565
}
6666
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
67-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.3.1" -MemberType NoteProperty
67+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.4.1" -MemberType NoteProperty
6868
}
6969
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7070
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

‎eng/common/tools.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
365365

366366
# If the version of msbuild is going to be xcopied,
367367
# use this version. Version matches a package here:
368-
# https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.3.1view=overview
369-
$defaultXCopyMSBuildVersion = '17.3.1'
368+
# https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.4.1&view=overview
369+
$defaultXCopyMSBuildVersion = '17.4.1'
370370

371371
if (!$vsRequirements) {
372372
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
}
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22558.4",
15-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22558.4",
14+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22572.6",
15+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22572.6",
1616
"Microsoft.Build.Traversal": "3.2.0",
1717
"Microsoft.SourceLink.GitHub": "1.1.0-beta-20206-02",
1818
"Microsoft.SourceLink.Common": "1.1.0-beta-20206-02"

0 commit comments

Comments
 (0)