Skip to content

Commit

Permalink
Merge dotnet/main into feature/native/gcc/mono
Browse files Browse the repository at this point in the history
  • Loading branch information
am11 committed Oct 31, 2021
2 parents 4a542e0 + f9a2449 commit 1962f6f
Show file tree
Hide file tree
Showing 1,977 changed files with 135,766 additions and 148,929 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "1.0.0-prerelease.21527.1",
"version": "1.0.0-prerelease.21527.2",
"commands": [
"xharness"
]
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
<_parseDistroRid>$(__DistroRid)</_parseDistroRid>
<_parseDistroRid Condition="'$(_parseDistroRid)' == '' and '$(MSBuildRuntimeType)' == 'core'">$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)</_parseDistroRid>
<_parseDistroRid Condition="'$(_parseDistroRid)' == '' and '$(MSBuildRuntimeType)' != 'core'">win-$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant)</_parseDistroRid>
<_distroRidIndex>$(_parseDistroRid.LastIndexOfAny("-"))</_distroRidIndex>
<_distroRidIndex>$(_parseDistroRid.LastIndexOf('-'))</_distroRidIndex>

<_runtimeOS>$(RuntimeOS)</_runtimeOS>
<_runtimeOS Condition="'$(_runtimeOS)' == ''">$(_parseDistroRid.SubString(0, $(_distroRidIndex)))</_runtimeOS>
Expand Down

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion eng/SourceBuild.props
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<TargetRid Condition="'$(TargetRid)' == ''">$(__DistroRid)</TargetRid>

<!-- Split e.g. 'fedora.33-x64' into 'fedora.33' and 'x64'. -->
<_targetRidPlatformIndex>$(TargetRid.LastIndexOfAny("-"))</_targetRidPlatformIndex>
<_targetRidPlatformIndex>$(TargetRid.LastIndexOf('-'))</_targetRidPlatformIndex>
<TargetRidWithoutPlatform>$(TargetRid.Substring(0, $(_targetRidPlatformIndex)))</TargetRidWithoutPlatform>
<TargetRidPlatform>$(TargetRid.Substring($(_targetRidPlatformIndex)).TrimStart('-'))</TargetRidPlatform>

Expand Down
116 changes: 58 additions & 58 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,91 +4,91 @@
<Uri>https://github.com/dotnet/icu</Uri>
<Sha>5146c6e78ad134305a4b3e857379bdd134db7ac0</Sha>
</Dependency>
<Dependency Name="System.Net.MsQuic.Transport" Version="6.0.0-preview.7.21526.1">
<Dependency Name="System.Net.MsQuic.Transport" Version="6.0.0-preview.7.21527.1">
<Uri>https://github.com/dotnet/msquic</Uri>
<Sha>e84278e45cd502355605070bb89606cfcdcd1cb6</Sha>
<Sha>7328f528564fede6d6a5e763bd4da3117ca59567</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-alpha.1.21520.2">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-alpha.1.21527.1">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>9f2345b3c5f43dbf34790e21657ae1f2445cd06a</Sha>
<Sha>efad634a7c316b67654b38690c56b3702363d6ae</Sha>
</Dependency>
<Dependency Name="System.ServiceModel.Primitives" Version="4.9.0-rc2.21473.1">
<Uri>https://github.com/dotnet/wcf</Uri>
<Sha>7f504aabb1988e9a093c1e74d8040bd52feb2f01</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21527.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21528.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9</Sha>
<Sha>b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21527.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21528.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9</Sha>
<Sha>b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.21527.1">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.21528.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9</Sha>
<Sha>b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.21527.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.21528.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9</Sha>
<Sha>b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.21527.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.21528.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9</Sha>
<Sha>b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.21527.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.21528.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9</Sha>
<Sha>b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21527.1">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21528.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9</Sha>
<Sha>b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.21527.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.21528.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9</Sha>
<Sha>b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.21527.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.21528.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9</Sha>
<Sha>b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21527.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21528.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9</Sha>
<Sha>b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.21527.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.21528.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9</Sha>
<Sha>b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.21527.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.21528.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9</Sha>
<Sha>b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.21527.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.21528.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9</Sha>
<Sha>b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="7.0.0-beta.21527.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="7.0.0-beta.21528.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9</Sha>
<Sha>b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.21527.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.21528.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9</Sha>
<Sha>b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.21527.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.21528.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9</Sha>
<Sha>b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.21527.1">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.21528.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9</Sha>
<Sha>b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.21527.1">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.21528.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9</Sha>
<Sha>b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
<Uri>https://github.com/microsoft/vstest</Uri>
Expand Down Expand Up @@ -198,37 +198,37 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9e795c014b0be513c84f96427c544bae486bb101</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.21513.1">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.21528.2">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>0f1bca76ee6a360d67a624c12b5b8d427db66226</Sha>
<Sha>a5f8466cb452f50436544572e38ff5faa17e2094</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21527.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21527.2">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>09775c67d4470afd26229cf19f5e651314e2ecb3</Sha>
<Sha>0b28b2c062b000f5115cd3ee70e4777dd025b263</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21527.1">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21527.2">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>09775c67d4470afd26229cf19f5e651314e2ecb3</Sha>
<Sha>0b28b2c062b000f5115cd3ee70e4777dd025b263</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.21527.1">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.21528.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>32ff2e3f45ae8fefed72a93ca17f4b01e106c7c9</Sha>
<Sha>b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21525.1">
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21528.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>858495292737c6b88227aa6a51230f62017e930f</Sha>
<Sha>192b56427754dc9ff4f34b7fc7039dfe6f37a4f4</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.21525.1">
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.21528.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>858495292737c6b88227aa6a51230f62017e930f</Sha>
<Sha>192b56427754dc9ff4f34b7fc7039dfe6f37a4f4</Sha>
</Dependency>
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.21525.1">
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.21528.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>858495292737c6b88227aa6a51230f62017e930f</Sha>
<Sha>192b56427754dc9ff4f34b7fc7039dfe6f37a4f4</Sha>
</Dependency>
<Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.21525.1">
<Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.21528.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>858495292737c6b88227aa6a51230f62017e930f</Sha>
<Sha>192b56427754dc9ff4f34b7fc7039dfe6f37a4f4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.0.2-alpha.0.21525.2">
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
Expand All @@ -238,9 +238,9 @@
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>e444c9ce30e40a75994fe6b4fd5e87a7ef63355b</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.21526.1">
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.21528.1">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
<Sha>736c86711d0381ce29ab7273df4a55bf2c0000bc</Sha>
<Sha>3541eb2b9c85dd1416ba7571f49c0e44019756b7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Compatibility" Version="2.0.0-alpha.1.21525.11">
<Uri>https://github.com/dotnet/sdk</Uri>
Expand Down
Loading

0 comments on commit 1962f6f

Please sign in to comment.