Skip to content

Commit 3288046

Browse files
directhexdirecthex
committed
Merge remote-tracking branch 'origin/main' into cmake-toolchain-support-is-moderately-cursed
2 parents 75ae939 + fb284a8 commit 3288046

File tree

29 files changed

+1315
-198
lines changed

29 files changed

+1315
-198
lines changed

Diff for: ‎.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": "1.0.0-prerelease.22071.1",
18+
"version": "1.0.0-prerelease.22074.1",
1919
"commands": [
2020
"xharness"
2121
]

Diff for: ‎THIRD-PARTY-NOTICES.TXT

+29
Original file line numberDiff line numberDiff line change
@@ -697,6 +697,35 @@ License for fastmod (https://github.com/lemire/fastmod) and ibm-fpgen (https://g
697697
See the License for the specific language governing permissions and
698698
limitations under the License.
699699

700+
License for sse4-strstr (https://github.com/WojciechMula/sse4-strstr)
701+
--------------------------------------
702+
703+
Copyright (c) 2008-2016, Wojciech Muła
704+
All rights reserved.
705+
706+
Redistribution and use in source and binary forms, with or without
707+
modification, are permitted provided that the following conditions are
708+
met:
709+
710+
1. Redistributions of source code must retain the above copyright
711+
notice, this list of conditions and the following disclaimer.
712+
713+
2. Redistributions in binary form must reproduce the above copyright
714+
notice, this list of conditions and the following disclaimer in the
715+
documentation and/or other materials provided with the distribution.
716+
717+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
718+
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
719+
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
720+
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
721+
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
722+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
723+
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
724+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
725+
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
726+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
727+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
728+
700729
License notice for The C++ REST SDK
701730
-----------------------------------
702731

Diff for: ‎eng/Version.Details.xml

+64-64
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="7.0.0-preview.2.22071.2">
3+
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="7.0.0-preview.2.22074.5">
44
<Uri>https://github.com/dotnet/icu</Uri>
5-
<Sha>8a4a45cc99e7d6e5244c16f581171633091b96b3</Sha>
5+
<Sha>80a658fa6aa6601d67bfe5a294e0d1b7e1184a5c</Sha>
66
</Dependency>
77
<Dependency Name="System.Net.MsQuic.Transport" Version="7.0.0-alpha.1.21529.3">
88
<Uri>https://github.com/dotnet/msquic</Uri>
@@ -50,77 +50,77 @@
5050
</Dependency>
5151
</ProductDependencies>
5252
<ToolsetDependencies>
53-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22071.6">
53+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22074.13">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
55+
<Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22071.6">
57+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22074.13">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
59+
<Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22071.6">
61+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22074.13">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
63+
<Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22071.6">
65+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22074.13">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
67+
<Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22071.6">
69+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22074.13">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
71+
<Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22071.6">
73+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22074.13">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
75+
<Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22071.6">
77+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22074.13">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
79+
<Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22071.6">
81+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22074.13">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
83+
<Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22071.6">
85+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22074.13">
8686
<Uri>https://github.com/dotnet/arcade</Uri>
87-
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
87+
<Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22071.6">
89+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22074.13">
9090
<Uri>https://github.com/dotnet/arcade</Uri>
91-
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
91+
<Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
9292
</Dependency>
93-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22071.6">
93+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22074.13">
9494
<Uri>https://github.com/dotnet/arcade</Uri>
95-
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
95+
<Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22071.6">
97+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22074.13">
9898
<Uri>https://github.com/dotnet/arcade</Uri>
99-
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
99+
<Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
100100
</Dependency>
101-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22071.6">
101+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22074.13">
102102
<Uri>https://github.com/dotnet/arcade</Uri>
103-
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
103+
<Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="7.0.0-beta.22071.6">
105+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="7.0.0-beta.22074.13">
106106
<Uri>https://github.com/dotnet/arcade</Uri>
107-
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
107+
<Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22071.6">
109+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22074.13">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
111+
<Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22071.6">
113+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22074.13">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
115+
<Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22071.6">
117+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22074.13">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
119+
<Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22071.6">
121+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22074.13">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
123+
<Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
124124
</Dependency>
125125
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
126126
<Uri>https://github.com/microsoft/vstest</Uri>
@@ -170,37 +170,37 @@
170170
<Uri>https://github.com/dotnet/runtime-assets</Uri>
171171
<Sha>a597df23119faf540d95cebab14b82f084c47384</Sha>
172172
</Dependency>
173-
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22067.2">
173+
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22074.2">
174174
<Uri>https://github.com/dotnet/llvm-project</Uri>
175-
<Sha>79a6d232058e2c2f1d9e833355b72f07fe342a3b</Sha>
175+
<Sha>44adf6c047663fe20c388bfb769e18dd3c91f7e0</Sha>
176176
</Dependency>
177-
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.22067.2">
177+
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.22074.2">
178178
<Uri>https://github.com/dotnet/llvm-project</Uri>
179-
<Sha>79a6d232058e2c2f1d9e833355b72f07fe342a3b</Sha>
179+
<Sha>44adf6c047663fe20c388bfb769e18dd3c91f7e0</Sha>
180180
</Dependency>
181-
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22067.2">
181+
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22074.2">
182182
<Uri>https://github.com/dotnet/llvm-project</Uri>
183-
<Sha>79a6d232058e2c2f1d9e833355b72f07fe342a3b</Sha>
183+
<Sha>44adf6c047663fe20c388bfb769e18dd3c91f7e0</Sha>
184184
</Dependency>
185-
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.22067.2">
185+
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.22074.2">
186186
<Uri>https://github.com/dotnet/llvm-project</Uri>
187-
<Sha>79a6d232058e2c2f1d9e833355b72f07fe342a3b</Sha>
187+
<Sha>44adf6c047663fe20c388bfb769e18dd3c91f7e0</Sha>
188188
</Dependency>
189-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22067.2">
189+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22074.2">
190190
<Uri>https://github.com/dotnet/llvm-project</Uri>
191-
<Sha>79a6d232058e2c2f1d9e833355b72f07fe342a3b</Sha>
191+
<Sha>44adf6c047663fe20c388bfb769e18dd3c91f7e0</Sha>
192192
</Dependency>
193-
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.22067.2">
193+
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.22074.2">
194194
<Uri>https://github.com/dotnet/llvm-project</Uri>
195-
<Sha>79a6d232058e2c2f1d9e833355b72f07fe342a3b</Sha>
195+
<Sha>44adf6c047663fe20c388bfb769e18dd3c91f7e0</Sha>
196196
</Dependency>
197-
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22067.2">
197+
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22074.2">
198198
<Uri>https://github.com/dotnet/llvm-project</Uri>
199-
<Sha>79a6d232058e2c2f1d9e833355b72f07fe342a3b</Sha>
199+
<Sha>44adf6c047663fe20c388bfb769e18dd3c91f7e0</Sha>
200200
</Dependency>
201-
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.22067.2">
201+
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.22074.2">
202202
<Uri>https://github.com/dotnet/llvm-project</Uri>
203-
<Sha>79a6d232058e2c2f1d9e833355b72f07fe342a3b</Sha>
203+
<Sha>44adf6c047663fe20c388bfb769e18dd3c91f7e0</Sha>
204204
</Dependency>
205205
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-alpha.1.22073.5">
206206
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -238,21 +238,21 @@
238238
<Uri>https://github.com/dotnet/linker</Uri>
239239
<Sha>e485816b48273d03bd6266a64dad9bea97f861d5</Sha>
240240
</Dependency>
241-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.22071.1">
241+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.22074.1">
242242
<Uri>https://github.com/dotnet/xharness</Uri>
243-
<Sha>bd2a12f9cc6c93c249f987b42c1c761550369674</Sha>
243+
<Sha>0137095821e2e5a9e030d97248503387b8d72a18</Sha>
244244
</Dependency>
245-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.22071.1">
245+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.22074.1">
246246
<Uri>https://github.com/dotnet/xharness</Uri>
247-
<Sha>bd2a12f9cc6c93c249f987b42c1c761550369674</Sha>
247+
<Sha>0137095821e2e5a9e030d97248503387b8d72a18</Sha>
248248
</Dependency>
249-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.22071.1">
249+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.22074.1">
250250
<Uri>https://github.com/dotnet/xharness</Uri>
251-
<Sha>bd2a12f9cc6c93c249f987b42c1c761550369674</Sha>
251+
<Sha>0137095821e2e5a9e030d97248503387b8d72a18</Sha>
252252
</Dependency>
253-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22071.6">
253+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22074.13">
254254
<Uri>https://github.com/dotnet/arcade</Uri>
255-
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
255+
<Sha>b6483cac5832aa5207692517f9a49ce1741a3041</Sha>
256256
</Dependency>
257257
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21577.2">
258258
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
@@ -270,9 +270,9 @@
270270
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
271271
<Sha>91d6b3c1f51888d166701510189505f35714665c</Sha>
272272
</Dependency>
273-
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.0.2-alpha.0.22069.1">
273+
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.0.2-alpha.0.22074.1">
274274
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
275-
<Sha>b6504c8dca937ff1a59d3283374241eacf26684a</Sha>
275+
<Sha>d3e96c2e8ed4d58de217c44423c9ba3b90333724</Sha>
276276
</Dependency>
277277
<Dependency Name="System.Runtime.Numerics.TestData" Version="7.0.0-beta.22060.1">
278278
<Uri>https://github.com/dotnet/runtime-assets</Uri>

0 commit comments

Comments
 (0)