Skip to content

Commit

Permalink
Merge remote-tracking branch 'dotnet/main' into fix-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
sharwell committed Mar 21, 2023
2 parents 39f0cdb + 9bf17ea commit 9294aad
Show file tree
Hide file tree
Showing 91 changed files with 1,207 additions and 799 deletions.
2 changes: 1 addition & 1 deletion .github/fabricbot.json
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@
{
"name": "addMilestone",
"parameters": {
"milestoneName": "8.0 Preview3"
"milestoneName": "8.0 Preview4"
}
}
],
Expand Down
5 changes: 5 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@
<EnableTrimAnalyzer Condition="$(IsTestProject) or $(IsAnalyzerProject) or $(MSBuildProjectDirectory.Contains('\tests\'))">false</EnableTrimAnalyzer>
</PropertyGroup>

<!-- Making all tests run sequentially until we regroup tests. Tracked under issue https://github.com/dotnet/winforms/issues/8810. -->
<PropertyGroup Condition="'$(IsTestProject)' == 'true'">
<XUnitCoreSettingsFile>$(RepositoryEngineeringDir)xunit.runner.json</XUnitCoreSettingsFile>
</PropertyGroup>

<!--
Set assembly version to align with major and minor version, as for the patches and revisions should be manually
updated per assembly if it is serviced.
Expand Down
140 changes: 70 additions & 70 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,148 +7,148 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
-->
<Dependencies>
<ProductDependencies>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.3.23164.1">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.3.23170.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c9f5ca2f34ee05403238797276279b28a417934c</Sha>
<Sha>5b71f85ee12fd60b00502bc2c201f6fa7d1f5963</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-preview.3.23164.1">
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-preview.3.23170.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c9f5ca2f34ee05403238797276279b28a417934c</Sha>
<Sha>5b71f85ee12fd60b00502bc2c201f6fa7d1f5963</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="8.0.0-preview.3.23164.1">
<Dependency Name="Microsoft.Win32.SystemEvents" Version="8.0.0-preview.3.23170.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c9f5ca2f34ee05403238797276279b28a417934c</Sha>
<Sha>5b71f85ee12fd60b00502bc2c201f6fa7d1f5963</Sha>
</Dependency>
<Dependency Name="Microsoft.Windows.Compatibility" Version="8.0.0-preview.3.23164.1">
<Dependency Name="Microsoft.Windows.Compatibility" Version="8.0.0-preview.3.23170.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c9f5ca2f34ee05403238797276279b28a417934c</Sha>
<Sha>5b71f85ee12fd60b00502bc2c201f6fa7d1f5963</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="8.0.0-preview.3.23164.1">
<Dependency Name="System.CodeDom" Version="8.0.0-preview.3.23170.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c9f5ca2f34ee05403238797276279b28a417934c</Sha>
<Sha>5b71f85ee12fd60b00502bc2c201f6fa7d1f5963</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="8.0.0-preview.3.23164.1">
<Dependency Name="System.Configuration.ConfigurationManager" Version="8.0.0-preview.3.23170.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c9f5ca2f34ee05403238797276279b28a417934c</Sha>
<Sha>5b71f85ee12fd60b00502bc2c201f6fa7d1f5963</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="8.0.0-preview.3.23164.1">
<Dependency Name="System.Resources.Extensions" Version="8.0.0-preview.3.23170.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c9f5ca2f34ee05403238797276279b28a417934c</Sha>
<Sha>5b71f85ee12fd60b00502bc2c201f6fa7d1f5963</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="8.0.0-preview.3.23164.1">
<Dependency Name="System.Security.Permissions" Version="8.0.0-preview.3.23170.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c9f5ca2f34ee05403238797276279b28a417934c</Sha>
<Sha>5b71f85ee12fd60b00502bc2c201f6fa7d1f5963</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="8.0.0-preview.3.23164.1">
<Dependency Name="System.Windows.Extensions" Version="8.0.0-preview.3.23170.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c9f5ca2f34ee05403238797276279b28a417934c</Sha>
<Sha>5b71f85ee12fd60b00502bc2c201f6fa7d1f5963</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="8.0.0-preview.3.23164.1">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="8.0.0-preview.3.23170.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c9f5ca2f34ee05403238797276279b28a417934c</Sha>
<Sha>5b71f85ee12fd60b00502bc2c201f6fa7d1f5963</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="8.0.0-preview.3.23164.1">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="8.0.0-preview.3.23170.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c9f5ca2f34ee05403238797276279b28a417934c</Sha>
<Sha>5b71f85ee12fd60b00502bc2c201f6fa7d1f5963</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="8.0.0-preview.3.23164.1">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="8.0.0-preview.3.23170.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c9f5ca2f34ee05403238797276279b28a417934c</Sha>
<Sha>5b71f85ee12fd60b00502bc2c201f6fa7d1f5963</Sha>
</Dependency>
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="8.0.0-preview.3.23164.1">
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="8.0.0-preview.3.23170.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c9f5ca2f34ee05403238797276279b28a417934c</Sha>
<Sha>5b71f85ee12fd60b00502bc2c201f6fa7d1f5963</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="8.0.0-preview.3.23164.1">
<Dependency Name="System.Diagnostics.EventLog" Version="8.0.0-preview.3.23170.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c9f5ca2f34ee05403238797276279b28a417934c</Sha>
<Sha>5b71f85ee12fd60b00502bc2c201f6fa7d1f5963</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="8.0.0-preview.3.23164.1">
<Dependency Name="System.DirectoryServices" Version="8.0.0-preview.3.23170.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c9f5ca2f34ee05403238797276279b28a417934c</Sha>
<Sha>5b71f85ee12fd60b00502bc2c201f6fa7d1f5963</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-preview.3.23164.1">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-preview.3.23170.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c9f5ca2f34ee05403238797276279b28a417934c</Sha>
<Sha>5b71f85ee12fd60b00502bc2c201f6fa7d1f5963</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="8.0.0-preview.3.23164.1">
<Dependency Name="System.Security.Cryptography.Xml" Version="8.0.0-preview.3.23170.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c9f5ca2f34ee05403238797276279b28a417934c</Sha>
<Sha>5b71f85ee12fd60b00502bc2c201f6fa7d1f5963</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="8.0.0-preview.3.23164.1">
<Dependency Name="System.IO.Packaging" Version="8.0.0-preview.3.23170.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c9f5ca2f34ee05403238797276279b28a417934c</Sha>
<Sha>5b71f85ee12fd60b00502bc2c201f6fa7d1f5963</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="8.0.0-preview.3.23164.1">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="8.0.0-preview.3.23170.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c9f5ca2f34ee05403238797276279b28a417934c</Sha>
<Sha>5b71f85ee12fd60b00502bc2c201f6fa7d1f5963</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.PerformanceCounter" Version="8.0.0-preview.3.23164.1">
<Dependency Name="System.Diagnostics.PerformanceCounter" Version="8.0.0-preview.3.23170.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c9f5ca2f34ee05403238797276279b28a417934c</Sha>
<Sha>5b71f85ee12fd60b00502bc2c201f6fa7d1f5963</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Pkcs" Version="8.0.0-preview.3.23164.1">
<Dependency Name="System.Security.Cryptography.Pkcs" Version="8.0.0-preview.3.23170.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c9f5ca2f34ee05403238797276279b28a417934c</Sha>
<Sha>5b71f85ee12fd60b00502bc2c201f6fa7d1f5963</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-preview.3.23164.1">
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-preview.3.23170.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c9f5ca2f34ee05403238797276279b28a417934c</Sha>
<Sha>5b71f85ee12fd60b00502bc2c201f6fa7d1f5963</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="8.0.0-preview.3.23164.1">
<Dependency Name="System.Text.Encodings.Web" Version="8.0.0-preview.3.23170.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c9f5ca2f34ee05403238797276279b28a417934c</Sha>
<Sha>5b71f85ee12fd60b00502bc2c201f6fa7d1f5963</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="8.0.0-preview.3.23164.1">
<Dependency Name="System.Text.Json" Version="8.0.0-preview.3.23170.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c9f5ca2f34ee05403238797276279b28a417934c</Sha>
<Sha>5b71f85ee12fd60b00502bc2c201f6fa7d1f5963</Sha>
</Dependency>
<Dependency Name="System.Threading.AccessControl" Version="8.0.0-preview.3.23164.1">
<Dependency Name="System.Threading.AccessControl" Version="8.0.0-preview.3.23170.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c9f5ca2f34ee05403238797276279b28a417934c</Sha>
<Sha>5b71f85ee12fd60b00502bc2c201f6fa7d1f5963</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.Registry.AccessControl" Version="8.0.0-preview.3.23164.1">
<Dependency Name="Microsoft.Win32.Registry.AccessControl" Version="8.0.0-preview.3.23170.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c9f5ca2f34ee05403238797276279b28a417934c</Sha>
<Sha>5b71f85ee12fd60b00502bc2c201f6fa7d1f5963</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.3.23164.1">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.3.23170.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c9f5ca2f34ee05403238797276279b28a417934c</Sha>
<Sha>5b71f85ee12fd60b00502bc2c201f6fa7d1f5963</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.3.23164.1">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.3.23170.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c9f5ca2f34ee05403238797276279b28a417934c</Sha>
<Sha>5b71f85ee12fd60b00502bc2c201f6fa7d1f5963</Sha>
</Dependency>
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="8.0.0-preview.3.23164.1">
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="8.0.0-preview.3.23170.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c9f5ca2f34ee05403238797276279b28a417934c</Sha>
<Sha>5b71f85ee12fd60b00502bc2c201f6fa7d1f5963</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<!-- Arcade -->
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23164.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23168.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0edf826d30ecfec312a2f36c3a688ef2449fa6b0</Sha>
<Sha>b12f035e893c34ec2c965d75f6e21b7a2667e98d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23164.2">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23168.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0edf826d30ecfec312a2f36c3a688ef2449fa6b0</Sha>
<Sha>b12f035e893c34ec2c965d75f6e21b7a2667e98d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23164.2">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23168.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0edf826d30ecfec312a2f36c3a688ef2449fa6b0</Sha>
<Sha>b12f035e893c34ec2c965d75f6e21b7a2667e98d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23164.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23168.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0edf826d30ecfec312a2f36c3a688ef2449fa6b0</Sha>
<Sha>b12f035e893c34ec2c965d75f6e21b7a2667e98d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23164.2">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23168.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0edf826d30ecfec312a2f36c3a688ef2449fa6b0</Sha>
<Sha>b12f035e893c34ec2c965d75f6e21b7a2667e98d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23164.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23168.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0edf826d30ecfec312a2f36c3a688ef2449fa6b0</Sha>
<Sha>b12f035e893c34ec2c965d75f6e21b7a2667e98d</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
Loading

0 comments on commit 9294aad

Please sign in to comment.