Skip to content

Commit

Permalink
Update dependencies from https://github.com/dotnet/arcade build 20221…
Browse files Browse the repository at this point in the history 
…201.6 (#80361)

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.22572.6 -> To Version 7.0.0-beta.22601.6

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
  • Loading branch information
@dotnet-maestro
dotnet-maestro[bot] and dotnet-maestro[bot] authored Jan 9, 2023
1 parent e516d18 commit dd6c533
Show file tree
Hide file tree
Showing 5 changed files with 64 additions and 58 deletions.
76 changes: 38 additions & 38 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,77 +58,77 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22572.6">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22601.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
<Sha>c01ccbc9554b39205750bf5bda7aad29f89bc0c9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22572.6">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22601.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
<Sha>c01ccbc9554b39205750bf5bda7aad29f89bc0c9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22572.6">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22601.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
<Sha>c01ccbc9554b39205750bf5bda7aad29f89bc0c9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22572.6">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22601.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
<Sha>c01ccbc9554b39205750bf5bda7aad29f89bc0c9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22572.6">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22601.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
<Sha>c01ccbc9554b39205750bf5bda7aad29f89bc0c9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22572.6">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22601.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
<Sha>c01ccbc9554b39205750bf5bda7aad29f89bc0c9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22572.6">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22601.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
<Sha>c01ccbc9554b39205750bf5bda7aad29f89bc0c9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22572.6">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22601.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
<Sha>c01ccbc9554b39205750bf5bda7aad29f89bc0c9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22572.6">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22601.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
<Sha>c01ccbc9554b39205750bf5bda7aad29f89bc0c9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22572.6">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22601.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
<Sha>c01ccbc9554b39205750bf5bda7aad29f89bc0c9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22572.6">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22601.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
<Sha>c01ccbc9554b39205750bf5bda7aad29f89bc0c9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22572.6">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22601.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
<Sha>c01ccbc9554b39205750bf5bda7aad29f89bc0c9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22572.6">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22601.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
<Sha>c01ccbc9554b39205750bf5bda7aad29f89bc0c9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22572.6">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22601.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
<Sha>c01ccbc9554b39205750bf5bda7aad29f89bc0c9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22572.6">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22601.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
<Sha>c01ccbc9554b39205750bf5bda7aad29f89bc0c9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22572.6">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22601.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
<Sha>c01ccbc9554b39205750bf5bda7aad29f89bc0c9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22572.6">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22601.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
<Sha>c01ccbc9554b39205750bf5bda7aad29f89bc0c9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22572.6">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22601.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
<Sha>c01ccbc9554b39205750bf5bda7aad29f89bc0c9</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22553.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -254,9 +254,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>5ebf69650b9f7b4ecab485be840b3022420f7812</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22572.6">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22601.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>82d0268ba6ae13318bcf7fcbcccf83472593ca62</Sha>
<Sha>c01ccbc9554b39205750bf5bda7aad29f89bc0c9</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,22 +62,22 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22572.6</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22572.6</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22572.6</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22572.6</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22572.6</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22572.6</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22572.6</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22572.6</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22572.6</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22572.6</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22572.6</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22572.6</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22572.6</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22572.6</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22572.6</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22572.6</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22601.6</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22601.6</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22601.6</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22601.6</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22601.6</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22601.6</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22601.6</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22601.6</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22601.6</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22601.6</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22601.6</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22601.6</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22601.6</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22601.6</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22601.6</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22601.6</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
6 changes: 6 additions & 0 deletions eng/common/templates/steps/source-build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ steps:
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
fi
runtimeOsArgs=
if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then
runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}'
fi
publishArgs=
if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
publishArgs='--publish'
Expand All @@ -75,6 +80,7 @@ steps:
$internalRuntimeDownloadArgs \
$internalRestoreArgs \
$targetRidArgs \
$runtimeOsArgs \
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
/p:ArcadeBuildFromSource=true
displayName: Build
Expand Down
2 changes: 1 addition & 1 deletion eng/common/tools.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ global_json_file="${repo_root}global.json"
# determine if global.json contains a "runtimes" entry
global_json_has_runtimes=false
if command -v jq &> /dev/null; then
if jq -er '. | select(has("runtimes"))' "$global_json_file" &> /dev/null; then
if jq -e '.tools | has("runtimes")' "$global_json_file" &> /dev/null; then
global_json_has_runtimes=true
fi
elif [[ "$(cat "$global_json_file")" =~ \"runtimes\"[[:space:]\:]*\{ ]]; then
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"dotnet": "7.0.100"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22572.6",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22572.6",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22572.6",
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22601.6",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22601.6",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22601.6",
"Microsoft.Build.NoTargets": "3.5.0",
"Microsoft.Build.Traversal": "3.1.6",
"Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6"
Expand Down

0 comments on commit dd6c533

Please sign in to comment.