Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Merging internal commits for release/7.0 #82117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 45 commits into from
Feb 15, 2023
Merged

Merging internal commits for release/7.0 #82117

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
4531191
Merge in 'release/7.0' changes
dotnet-bot Jan 4, 2023
c06def7
Merge in 'release/7.0' changes
dotnet-bot Jan 4, 2023
de25153
Merge in 'release/7.0' changes
dotnet-bot Jan 4, 2023
088e67d
Merge in 'release/7.0' changes
dotnet-bot Jan 4, 2023
b62f7e1
Merge in 'release/7.0' changes
dotnet-bot Jan 4, 2023
a59bea8
Merge in 'release/7.0' changes
dotnet-bot Jan 4, 2023
b50a270
Merge in 'release/7.0' changes
dotnet-bot Jan 4, 2023
aeac6c1
Merge in 'release/7.0' changes
dotnet-bot Jan 4, 2023
1341e29
Merge in 'release/7.0' changes
dotnet-bot Jan 4, 2023
b39831b
Merge in 'release/7.0' changes
dotnet-bot Jan 5, 2023
6da6b53
Merge in 'release/7.0' changes
dotnet-bot Jan 5, 2023
bdb6f00
Merge in 'release/7.0' changes
dotnet-bot Jan 5, 2023
db4c096
Merge in 'release/7.0' changes
dotnet-bot Jan 5, 2023
e13c32f
Merge in 'release/7.0' changes
dotnet-bot Jan 5, 2023
4824eef
Merge in 'release/7.0' changes
dotnet-bot Jan 5, 2023
2eb0000
Merge in 'release/7.0' changes
dotnet-bot Jan 5, 2023
3d31934
Merge in 'release/7.0' changes
dotnet-bot Jan 5, 2023
266050f
Merge in 'release/7.0' changes
dotnet-bot Jan 5, 2023
275fa87
Merge in 'release/7.0' changes
dotnet-bot Jan 6, 2023
f155fe7
Merge in 'release/7.0' changes
dotnet-bot Jan 6, 2023
05b0551
Merge in 'release/7.0' changes
dotnet-bot Jan 9, 2023
c443d36
Merge in 'release/7.0' changes
dotnet-bot Jan 9, 2023
fe8ed10
Merge in 'release/7.0' changes
dotnet-bot Jan 9, 2023
a3ecc35
Merge in 'release/7.0' changes
dotnet-bot Jan 10, 2023
5d69c40
Merge in 'release/7.0' changes
dotnet-bot Jan 11, 2023
9ed153b
Merge in 'release/7.0' changes
dotnet-bot Jan 11, 2023
7ae2199
Merge in 'release/7.0' changes
dotnet-bot Jan 11, 2023
9fb3185
Merge in 'release/7.0' changes
dotnet-bot Jan 11, 2023
d3109e6
Merge in 'release/7.0' changes
dotnet-bot Jan 11, 2023
7421686
Merge in 'release/7.0' changes
dotnet-bot Jan 12, 2023
a686e14
Merge in 'release/7.0' changes
dotnet-bot Jan 12, 2023
b373e5a
Merge in 'release/7.0' changes
dotnet-bot Jan 12, 2023
c89681a
Merge in 'release/7.0' changes
dotnet-bot Jan 12, 2023
f7ca579
Merge in 'release/7.0' changes
dotnet-bot Jan 12, 2023
08e84f4
Merge in 'release/7.0' changes
dotnet-bot Jan 13, 2023
0cd7795
Merge in 'release/7.0' changes
dotnet-bot Jan 13, 2023
6f8f3db
Merge in 'release/7.0' changes
dotnet-bot Jan 13, 2023
aa2fe3a
Merge in 'release/7.0' changes
dotnet-bot Jan 13, 2023
de2e228
Merge in 'release/7.0' changes
dotnet-bot Jan 13, 2023
153136d
Merge in 'release/7.0' changes
dotnet-bot Jan 17, 2023
8b3d962
Merged PR 28849: Updated Microsoft.Diasymreader.Native to 16.11.23-be…
hoyosjs Jan 18, 2023
1675784
Merged PR 28999: Do not set up nuget sources for source build
mmitche Jan 19, 2023
90768a2
Merged PR 29008: Disable source-build leg for 7.0.
crummel Jan 19, 2023
0a2bda1
Merged PR 29014: Disable source build for 7.0 in official and revert …
mmitche Jan 19, 2023
bd47178
Merge commit '0a2bda10e81d901396c3cff95533529e3a93ad47' into internal…
vseanreesermsft Feb 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 38 additions & 38 deletions eng/Version.Details.xml
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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