Skip to content

Commit 5edd2f9

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20221122.6 (#78830)
Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.22561.2 -> To Version 7.0.0-beta.22572.6 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent a790868 commit 5edd2f9

File tree

7 files changed

+67
-66
lines changed

7 files changed

+67
-66
lines changed

‎eng/Version.Details.xml

+38-38
Original file line numberDiff line numberDiff line change
@@ -58,77 +58,77 @@
5858
</Dependency>
5959
</ProductDependencies>
6060
<ToolsetDependencies>
61-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22561.2">
61+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22572.6">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
63+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22561.2">
65+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22572.6">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
67+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22561.2">
69+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22572.6">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
71+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22561.2">
73+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22572.6">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
75+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22561.2">
77+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22572.6">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
79+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22561.2">
81+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22572.6">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
83+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22561.2">
85+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22572.6">
8686
<Uri>https://github.com/dotnet/arcade</Uri>
87-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
87+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22561.2">
89+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22572.6">
9090
<Uri>https://github.com/dotnet/arcade</Uri>
91-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
91+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
9292
</Dependency>
93-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22561.2">
93+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22572.6">
9494
<Uri>https://github.com/dotnet/arcade</Uri>
95-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
95+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22561.2">
97+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22572.6">
9898
<Uri>https://github.com/dotnet/arcade</Uri>
99-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
99+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
100100
</Dependency>
101-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22561.2">
101+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22572.6">
102102
<Uri>https://github.com/dotnet/arcade</Uri>
103-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
103+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22561.2">
105+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22572.6">
106106
<Uri>https://github.com/dotnet/arcade</Uri>
107-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
107+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22561.2">
109+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22572.6">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
111+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22561.2">
113+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22572.6">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
115+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22561.2">
117+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22572.6">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
119+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22561.2">
121+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22572.6">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
123+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22561.2">
125+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22572.6">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
127+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
128128
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22561.2">
129+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22572.6">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
131+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
132132
</Dependency>
133133
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22553.1">
134134
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -254,9 +254,9 @@
254254
<Uri>https://github.com/dotnet/xharness</Uri>
255255
<Sha>5ebf69650b9f7b4ecab485be840b3022420f7812</Sha>
256256
</Dependency>
257-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22561.2">
257+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22572.6">
258258
<Uri>https://github.com/dotnet/arcade</Uri>
259-
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
259+
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
260260
</Dependency>
261261
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
262262
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props

+16-16
Original file line numberDiff line numberDiff line change
@@ -62,22 +62,22 @@
6262
<!-- SDK dependencies -->
6363
<MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
6464
<!-- Arcade dependencies -->
65-
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22561.2</MicrosoftDotNetApiCompatVersion>
66-
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22561.2</MicrosoftDotNetBuildTasksFeedVersion>
67-
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22561.2</MicrosoftDotNetCodeAnalysisVersion>
68-
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22561.2</MicrosoftDotNetGenAPIVersion>
69-
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22561.2</MicrosoftDotNetGenFacadesVersion>
70-
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22561.2</MicrosoftDotNetXUnitExtensionsVersion>
71-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22561.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
72-
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22561.2</MicrosoftDotNetBuildTasksArchivesVersion>
73-
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22561.2</MicrosoftDotNetBuildTasksInstallersVersion>
74-
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22561.2</MicrosoftDotNetBuildTasksPackagingVersion>
75-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22561.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
76-
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22561.2</MicrosoftDotNetBuildTasksTemplatingVersion>
77-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22561.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
78-
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22561.2</MicrosoftDotNetRemoteExecutorVersion>
79-
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22561.2</MicrosoftDotNetVersionToolsTasksVersion>
80-
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22561.2</MicrosoftDotNetPackageTestingVersion>
65+
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22572.6</MicrosoftDotNetApiCompatVersion>
66+
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22572.6</MicrosoftDotNetBuildTasksFeedVersion>
67+
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22572.6</MicrosoftDotNetCodeAnalysisVersion>
68+
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22572.6</MicrosoftDotNetGenAPIVersion>
69+
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22572.6</MicrosoftDotNetGenFacadesVersion>
70+
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22572.6</MicrosoftDotNetXUnitExtensionsVersion>
71+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22572.6</MicrosoftDotNetXUnitConsoleRunnerVersion>
72+
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22572.6</MicrosoftDotNetBuildTasksArchivesVersion>
73+
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22572.6</MicrosoftDotNetBuildTasksInstallersVersion>
74+
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22572.6</MicrosoftDotNetBuildTasksPackagingVersion>
75+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22572.6</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
76+
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22572.6</MicrosoftDotNetBuildTasksTemplatingVersion>
77+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22572.6</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
78+
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22572.6</MicrosoftDotNetRemoteExecutorVersion>
79+
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22572.6</MicrosoftDotNetVersionToolsTasksVersion>
80+
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22572.6</MicrosoftDotNetPackageTestingVersion>
8181
<!-- NuGet dependencies -->
8282
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
8383
<!-- Installer dependencies -->

‎eng/common/cross/toolchain.cmake

+7
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

+1-1
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/templates/steps/source-build.yml

-6
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,6 @@ steps:
6363
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
6464
fi
6565
66-
runtimeOsArgs=
67-
if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then
68-
runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}'
69-
fi
70-
7166
publishArgs=
7267
if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
7368
publishArgs='--publish'
@@ -80,7 +75,6 @@ steps:
8075
$internalRuntimeDownloadArgs \
8176
$internalRestoreArgs \
8277
$targetRidArgs \
83-
$runtimeOsArgs \
8478
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
8579
/p:ArcadeBuildFromSource=true
8680
displayName: Build

‎eng/common/tools.ps1

+2-2
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

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"dotnet": "7.0.100"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22561.2",
12-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22561.2",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22561.2",
11+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22572.6",
12+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22572.6",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22572.6",
1414
"Microsoft.Build.NoTargets": "3.5.0",
1515
"Microsoft.Build.Traversal": "3.1.6",
1616
"Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6"

0 commit comments

Comments
 (0)