Skip to content

Commit 97d8f4c

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/6.0' changes
2 parents 7dd5777 + 673b083 commit 97d8f4c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1440
-1964
lines changed

‎.config/dotnet-tools.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "6.0.0-prerelease.24154.4",
18+
"version": "6.0.0-prerelease.24208.3",
1919
"commands": [
2020
"xharness"
2121
]

‎NuGet.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<clear />
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-emsdk -->
12-
<add key="darc-pub-dotnet-emsdk-5a6205a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-5a6205aa/nuget/v3/index.json" />
12+
<add key="darc-pub-dotnet-emsdk-3b28b2c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3b28b2c8/nuget/v3/index.json" />
1313
<!-- End: Package sources from dotnet-emsdk -->
1414
<!-- Begin: Package sources from dotnet-wcf -->
1515
<!-- End: Package sources from dotnet-wcf -->

‎THIRD-PARTY-NOTICES.TXT

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ https://github.com/madler/zlib
7373
https://zlib.net/zlib_license.html
7474

7575
/* zlib.h -- interface of the 'zlib' general purpose compression library
76-
version 1.2.13, October 13th, 2022
76+
version 1.3.1, January 22nd, 2024
7777

7878
Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
7979

‎eng/Version.Details.xml

+76-76
Original file line numberDiff line numberDiff line change
@@ -1,150 +1,150 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-rtm.24114.3">
3+
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-rtm.24211.1">
44
<Uri>https://github.com/dotnet/icu</Uri>
5-
<Sha>b62077d90972117ad4663128962914864b19ad05</Sha>
5+
<Sha>f2734cffa9b7f1270de7cc701e76b9a8eb938a19</Sha>
66
</Dependency>
77
<Dependency Name="System.Net.MsQuic.Transport" Version="6.0.0-servicing.22205.1">
88
<Uri>https://github.com/dotnet/msquic</Uri>
99
<Sha>7312355e44fd230b7aa26c7190f3870391751476</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.29">
11+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.30">
1212
<Uri>https://github.com/dotnet/emsdk</Uri>
13-
<Sha>5a6205aabc468d65922f79266532e0eea9ca97ec</Sha>
13+
<Sha>3b28b2c8eb8a64c82c01e3deb104cfedf3b6a8ca</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.29">
15+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.30">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>5a6205aabc468d65922f79266532e0eea9ca97ec</Sha>
17+
<Sha>3b28b2c8eb8a64c82c01e3deb104cfedf3b6a8ca</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.29">
19+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.30">
2020
<Uri>https://github.com/dotnet/emsdk</Uri>
21-
<Sha>5a6205aabc468d65922f79266532e0eea9ca97ec</Sha>
21+
<Sha>3b28b2c8eb8a64c82c01e3deb104cfedf3b6a8ca</Sha>
2222
</Dependency>
2323
<Dependency Name="System.ServiceModel.Primitives" Version="4.9.0">
2424
<Uri>https://github.com/dotnet/wcf</Uri>
2525
<Sha>04c3656e0325277aefa18378f24238d39b259222</Sha>
2626
</Dependency>
2727
</ProductDependencies>
2828
<ToolsetDependencies>
29-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24163.13">
29+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24204.4">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
31+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24163.13">
33+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24204.4">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
35+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24163.13">
37+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24204.4">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
39+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24163.13">
41+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24204.4">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
43+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.24163.13">
45+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.24204.4">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
47+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24163.13">
49+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24204.4">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
51+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24163.13">
53+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24204.4">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
55+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.24163.13">
57+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.24204.4">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
59+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.24163.13">
61+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.24204.4">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
63+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24163.13">
65+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24204.4">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
67+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24163.13">
69+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24204.4">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
71+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.24163.13">
73+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.24204.4">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
75+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24163.13">
77+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24204.4">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
79+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.24163.13">
81+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.24204.4">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
83+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.24163.13">
85+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.24204.4">
8686
<Uri>https://github.com/dotnet/arcade</Uri>
87-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
87+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.24163.13">
89+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.24204.4">
9090
<Uri>https://github.com/dotnet/arcade</Uri>
91-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
91+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
9292
</Dependency>
93-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.24163.13">
93+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.24204.4">
9494
<Uri>https://github.com/dotnet/arcade</Uri>
95-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
95+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.24163.13">
97+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.24204.4">
9898
<Uri>https://github.com/dotnet/arcade</Uri>
99-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
99+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
100100
</Dependency>
101101
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
102102
<Uri>https://github.com/microsoft/vstest</Uri>
103103
<Sha>140434f7109d357d0158ade9e5164a4861513965</Sha>
104104
</Dependency>
105-
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="6.0.0-beta.24124.1">
105+
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="6.0.0-beta.24211.3">
106106
<Uri>https://github.com/dotnet/runtime-assets</Uri>
107-
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
107+
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
108108
</Dependency>
109-
<Dependency Name="System.Data.Common.TestData" Version="6.0.0-beta.24124.1">
109+
<Dependency Name="System.Data.Common.TestData" Version="6.0.0-beta.24211.3">
110110
<Uri>https://github.com/dotnet/runtime-assets</Uri>
111-
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
111+
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
112112
</Dependency>
113-
<Dependency Name="System.Drawing.Common.TestData" Version="6.0.0-beta.24124.1">
113+
<Dependency Name="System.Drawing.Common.TestData" Version="6.0.0-beta.24211.3">
114114
<Uri>https://github.com/dotnet/runtime-assets</Uri>
115-
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
115+
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
116116
</Dependency>
117-
<Dependency Name="System.IO.Compression.TestData" Version="6.0.0-beta.24124.1">
117+
<Dependency Name="System.IO.Compression.TestData" Version="6.0.0-beta.24211.3">
118118
<Uri>https://github.com/dotnet/runtime-assets</Uri>
119-
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
119+
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
120120
</Dependency>
121-
<Dependency Name="System.IO.Packaging.TestData" Version="6.0.0-beta.24124.1">
121+
<Dependency Name="System.IO.Packaging.TestData" Version="6.0.0-beta.24211.3">
122122
<Uri>https://github.com/dotnet/runtime-assets</Uri>
123-
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
123+
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
124124
</Dependency>
125-
<Dependency Name="System.Net.TestData" Version="6.0.0-beta.24124.1">
125+
<Dependency Name="System.Net.TestData" Version="6.0.0-beta.24211.3">
126126
<Uri>https://github.com/dotnet/runtime-assets</Uri>
127-
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
127+
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
128128
</Dependency>
129-
<Dependency Name="System.Private.Runtime.UnicodeData" Version="6.0.0-beta.24124.1">
129+
<Dependency Name="System.Private.Runtime.UnicodeData" Version="6.0.0-beta.24211.3">
130130
<Uri>https://github.com/dotnet/runtime-assets</Uri>
131-
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
131+
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
132132
</Dependency>
133-
<Dependency Name="System.Runtime.TimeZoneData" Version="6.0.0-beta.24124.1">
133+
<Dependency Name="System.Runtime.TimeZoneData" Version="6.0.0-beta.24211.3">
134134
<Uri>https://github.com/dotnet/runtime-assets</Uri>
135-
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
135+
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
136136
</Dependency>
137-
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="6.0.0-beta.24124.1">
137+
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="6.0.0-beta.24211.3">
138138
<Uri>https://github.com/dotnet/runtime-assets</Uri>
139-
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
139+
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
140140
</Dependency>
141-
<Dependency Name="System.Windows.Extensions.TestData" Version="6.0.0-beta.24124.1">
141+
<Dependency Name="System.Windows.Extensions.TestData" Version="6.0.0-beta.24211.3">
142142
<Uri>https://github.com/dotnet/runtime-assets</Uri>
143-
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
143+
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
144144
</Dependency>
145-
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="6.0.0-beta.24124.1">
145+
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="6.0.0-beta.24211.3">
146146
<Uri>https://github.com/dotnet/runtime-assets</Uri>
147-
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
147+
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
148148
</Dependency>
149149
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.21416.1">
150150
<Uri>https://github.com/dotnet/llvm-project</Uri>
@@ -214,17 +214,17 @@
214214
<Uri>https://github.com/mono/linker</Uri>
215215
<Sha>c8499798a2a09639174e2f5c694d6652794cc73d</Sha>
216216
</Dependency>
217-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="6.0.0-prerelease.24154.4">
217+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="6.0.0-prerelease.24208.3">
218218
<Uri>https://github.com/dotnet/xharness</Uri>
219-
<Sha>e3f823d9e7dd5b42dde2fc3cdc1fb3650dd197f2</Sha>
219+
<Sha>b107ade008f89b2e4e7ce73ee92b6ba193bb623a</Sha>
220220
</Dependency>
221-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="6.0.0-prerelease.24154.4">
221+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="6.0.0-prerelease.24208.3">
222222
<Uri>https://github.com/dotnet/xharness</Uri>
223-
<Sha>e3f823d9e7dd5b42dde2fc3cdc1fb3650dd197f2</Sha>
223+
<Sha>b107ade008f89b2e4e7ce73ee92b6ba193bb623a</Sha>
224224
</Dependency>
225-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.24163.13">
225+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.24204.4">
226226
<Uri>https://github.com/dotnet/arcade</Uri>
227-
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
227+
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
228228
</Dependency>
229229
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21416.5">
230230
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
@@ -242,13 +242,13 @@
242242
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
243243
<Sha>d50065944d8b41d804448a7056351481d583ad3d</Sha>
244244
</Dependency>
245-
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="6.0.0-alpha.0.24115.1">
245+
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="6.0.0-alpha.0.24211.2">
246246
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
247-
<Sha>0d7d008228ffdfeb200fdf8039419a7c019eff50</Sha>
247+
<Sha>b11d2b601cd75038e3f587650f75286f0a0b6902</Sha>
248248
</Dependency>
249-
<Dependency Name="System.Runtime.Numerics.TestData" Version="6.0.0-beta.24124.1">
249+
<Dependency Name="System.Runtime.Numerics.TestData" Version="6.0.0-beta.24211.3">
250250
<Uri>https://github.com/dotnet/runtime-assets</Uri>
251-
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
251+
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
252252
</Dependency>
253253
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0-rc1.21413.4">
254254
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>

0 commit comments

Comments
 (0)