Skip to content

Commit 2aef67c

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/7.0' changes
2 parents f4b6c8d + 52cc10e commit 2aef67c

File tree

5 files changed

+70
-70
lines changed

5 files changed

+70
-70
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "7.0.0-prerelease.24054.3",
18+
"version": "7.0.0-prerelease.24073.2",
1919
"commands": [
2020
"xharness"
2121
]

‎eng/Version.Details.xml‎

Lines changed: 44 additions & 44 deletions
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.24059.5">
61+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24114.2">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
63+
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24059.5">
65+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24114.2">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
67+
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.24059.5">
69+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.24114.2">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
71+
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.24059.5">
73+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.24114.2">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
75+
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.24059.5">
77+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.24114.2">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
79+
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.24059.5">
81+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.24114.2">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
83+
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24059.5">
85+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24114.2">
8686
<Uri>https://github.com/dotnet/arcade</Uri>
87-
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
87+
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.24059.5">
89+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.24114.2">
9090
<Uri>https://github.com/dotnet/arcade</Uri>
91-
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
91+
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
9292
</Dependency>
93-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.24059.5">
93+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.24114.2">
9494
<Uri>https://github.com/dotnet/arcade</Uri>
95-
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
95+
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.24059.5">
97+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.24114.2">
9898
<Uri>https://github.com/dotnet/arcade</Uri>
99-
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
99+
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
100100
</Dependency>
101-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.24059.5">
101+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.24114.2">
102102
<Uri>https://github.com/dotnet/arcade</Uri>
103-
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
103+
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.24059.5">
105+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.24114.2">
106106
<Uri>https://github.com/dotnet/arcade</Uri>
107-
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
107+
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.24059.5">
109+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.24114.2">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
111+
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.24059.5">
113+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.24114.2">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
115+
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.24059.5">
117+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.24114.2">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
119+
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.24059.5">
121+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.24114.2">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
123+
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.24059.5">
125+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.24114.2">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
127+
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
128128
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.24059.5">
129+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.24114.2">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
131+
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
132132
</Dependency>
133133
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.24108.3">
134134
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -246,21 +246,21 @@
246246
<Uri>https://github.com/dotnet/linker</Uri>
247247
<Sha>53b3303c57b3fe659500fb362a0eef12991c1197</Sha>
248248
</Dependency>
249-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="7.0.0-prerelease.24054.3">
249+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="7.0.0-prerelease.24073.2">
250250
<Uri>https://github.com/dotnet/xharness</Uri>
251-
<Sha>d4bda077bfbe30e25c4569591e8c5c6221e24cc0</Sha>
251+
<Sha>068c593390bc20675e70d0dff8e99fc473715cf1</Sha>
252252
</Dependency>
253-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="7.0.0-prerelease.24054.3">
253+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="7.0.0-prerelease.24073.2">
254254
<Uri>https://github.com/dotnet/xharness</Uri>
255-
<Sha>d4bda077bfbe30e25c4569591e8c5c6221e24cc0</Sha>
255+
<Sha>068c593390bc20675e70d0dff8e99fc473715cf1</Sha>
256256
</Dependency>
257-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="7.0.0-prerelease.24054.3">
257+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="7.0.0-prerelease.24073.2">
258258
<Uri>https://github.com/dotnet/xharness</Uri>
259-
<Sha>d4bda077bfbe30e25c4569591e8c5c6221e24cc0</Sha>
259+
<Sha>068c593390bc20675e70d0dff8e99fc473715cf1</Sha>
260260
</Dependency>
261-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.24059.5">
261+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.24114.2">
262262
<Uri>https://github.com/dotnet/arcade</Uri>
263-
<Sha>02d5538bac1bacfd6fb310d92ab8914de08f3358</Sha>
263+
<Sha>5fd1dbf1679abc625e9e74614d9d7a28d151d675</Sha>
264264
</Dependency>
265265
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
266266
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -53,22 +53,22 @@
5353
<!-- SDK dependencies -->
5454
<MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
5555
<!-- Arcade dependencies -->
56-
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.24059.5</MicrosoftDotNetApiCompatVersion>
57-
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.24059.5</MicrosoftDotNetBuildTasksFeedVersion>
58-
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.24059.5</MicrosoftDotNetCodeAnalysisVersion>
59-
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.24059.5</MicrosoftDotNetGenAPIVersion>
60-
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.24059.5</MicrosoftDotNetGenFacadesVersion>
61-
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.24059.5</MicrosoftDotNetXUnitExtensionsVersion>
62-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24059.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
63-
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.24059.5</MicrosoftDotNetBuildTasksArchivesVersion>
64-
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.24059.5</MicrosoftDotNetBuildTasksInstallersVersion>
65-
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.24059.5</MicrosoftDotNetBuildTasksPackagingVersion>
66-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.24059.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
67-
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.24059.5</MicrosoftDotNetBuildTasksTemplatingVersion>
68-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.24059.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
69-
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.24059.5</MicrosoftDotNetRemoteExecutorVersion>
70-
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.24059.5</MicrosoftDotNetVersionToolsTasksVersion>
71-
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.24059.5</MicrosoftDotNetPackageTestingVersion>
56+
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.24114.2</MicrosoftDotNetApiCompatVersion>
57+
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.24114.2</MicrosoftDotNetBuildTasksFeedVersion>
58+
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.24114.2</MicrosoftDotNetCodeAnalysisVersion>
59+
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.24114.2</MicrosoftDotNetGenAPIVersion>
60+
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.24114.2</MicrosoftDotNetGenFacadesVersion>
61+
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.24114.2</MicrosoftDotNetXUnitExtensionsVersion>
62+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24114.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
63+
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.24114.2</MicrosoftDotNetBuildTasksArchivesVersion>
64+
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.24114.2</MicrosoftDotNetBuildTasksInstallersVersion>
65+
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.24114.2</MicrosoftDotNetBuildTasksPackagingVersion>
66+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.24114.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
67+
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.24114.2</MicrosoftDotNetBuildTasksTemplatingVersion>
68+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.24114.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
69+
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.24114.2</MicrosoftDotNetRemoteExecutorVersion>
70+
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.24114.2</MicrosoftDotNetVersionToolsTasksVersion>
71+
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.24114.2</MicrosoftDotNetPackageTestingVersion>
7272
<!-- NuGet dependencies -->
7373
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
7474
<!-- Installer dependencies -->
@@ -154,9 +154,9 @@
154154
<!-- Testing -->
155155
<MicrosoftNETCoreCoreDisToolsVersion>1.1.0</MicrosoftNETCoreCoreDisToolsVersion>
156156
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
157-
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>7.0.0-prerelease.24054.3</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
158-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>7.0.0-prerelease.24054.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
159-
<MicrosoftDotNetXHarnessCLIVersion>7.0.0-prerelease.24054.3</MicrosoftDotNetXHarnessCLIVersion>
157+
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>7.0.0-prerelease.24073.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
158+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>7.0.0-prerelease.24073.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
159+
<MicrosoftDotNetXHarnessCLIVersion>7.0.0-prerelease.24073.2</MicrosoftDotNetXHarnessCLIVersion>
160160
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>7.0.0-alpha.0.24060.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
161161
<XUnitVersion>2.4.2</XUnitVersion>
162162
<XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>

‎eng/common/native/init-compiler.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then
7171
# Set default versions
7272
if [[ -z "$majorVersion" ]]; then
7373
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
74-
if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
74+
if [[ "$compiler" == "clang" ]]; then versions=( 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
7575
elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi
7676

7777
for version in "${versions[@]}"; do

‎global.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"sdk": {
3-
"version": "7.0.115",
3+
"version": "7.0.116",
44
"allowPrerelease": true,
55
"rollForward": "major"
66
},
77
"tools": {
8-
"dotnet": "7.0.115"
8+
"dotnet": "7.0.116"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24059.5",
12-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24059.5",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.24059.5",
11+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24114.2",
12+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24114.2",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.24114.2",
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)