diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 12a93d612fa..4840bc78721 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,31 +6,31 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.25603.106 - 11.0.0-beta.25603.106 - 11.0.0-beta.25603.106 - 11.0.0-beta.25603.106 - 11.0.0-beta.25603.106 - 11.0.0-beta.25603.106 - 11.0.0-beta.25603.106 - 10.0.0-rc.3.25603.106 - 10.0.0-rc.3.25603.106 - 10.0.0-rc.3.25603.106 - 10.0.0-rc.3.25603.106 - 10.0.0-rc.3.25603.106 - 10.0.0-rc.3.25603.106 - 10.0.0-rc.3.25603.106 - 10.0.0-rc.3.25603.106 - 10.0.0-rc.3.25603.106 - 10.0.0-rc.3.25603.106 - 10.0.0-rc.3.25603.106 - 10.0.0-rc.3.25603.106 - 10.0.0-rc.3.25603.106 - 10.0.0-rc.3.25603.106 - 10.0.0-rc.3.25603.106 - 10.0.0-rc.3.25603.106 - 10.0.0-rc.3.25603.106 - 10.0.0-rc.3.25603.106 + 11.0.0-beta.25608.101 + 11.0.0-beta.25608.101 + 11.0.0-beta.25608.101 + 11.0.0-beta.25608.101 + 11.0.0-beta.25608.101 + 11.0.0-beta.25608.101 + 11.0.0-beta.25608.101 + 11.0.0-alpha.1.25608.101 + 11.0.0-alpha.1.25608.101 + 11.0.0-alpha.1.25608.101 + 11.0.0-alpha.1.25608.101 + 11.0.0-alpha.1.25608.101 + 11.0.0-alpha.1.25608.101 + 11.0.0-alpha.1.25608.101 + 11.0.0-alpha.1.25608.101 + 11.0.0-alpha.1.25608.101 + 11.0.0-alpha.1.25608.101 + 11.0.0-alpha.1.25608.101 + 11.0.0-alpha.1.25608.101 + 11.0.0-alpha.1.25608.101 + 11.0.0-alpha.1.25608.101 + 11.0.0-alpha.1.25608.101 + 11.0.0-alpha.1.25608.101 + 11.0.0-alpha.1.25608.101 + 11.0.0-alpha.1.25608.101 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 691560481c1..9b380546b54 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,110 +6,110 @@ Note: if the Uri is a new place, you will need to add a subscription from that p And you can check these with "darc get-dependencies target-repo "winforms" --> - + - + https://github.com/dotnet/dotnet - 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a + ce3dea8b1d1c12cf4b85999f834052d942d84a6d - + https://github.com/dotnet/dotnet - 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a + ce3dea8b1d1c12cf4b85999f834052d942d84a6d - + https://github.com/dotnet/dotnet - 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a + ce3dea8b1d1c12cf4b85999f834052d942d84a6d - + https://github.com/dotnet/dotnet - 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a + ce3dea8b1d1c12cf4b85999f834052d942d84a6d - + https://github.com/dotnet/dotnet - 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a + ce3dea8b1d1c12cf4b85999f834052d942d84a6d - + https://github.com/dotnet/dotnet - 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a + ce3dea8b1d1c12cf4b85999f834052d942d84a6d - + https://github.com/dotnet/dotnet - 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a + ce3dea8b1d1c12cf4b85999f834052d942d84a6d - + https://github.com/dotnet/dotnet - 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a + ce3dea8b1d1c12cf4b85999f834052d942d84a6d - + https://github.com/dotnet/dotnet - 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a + ce3dea8b1d1c12cf4b85999f834052d942d84a6d - + https://github.com/dotnet/dotnet - 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a + ce3dea8b1d1c12cf4b85999f834052d942d84a6d - + https://github.com/dotnet/dotnet - 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a + ce3dea8b1d1c12cf4b85999f834052d942d84a6d - + https://github.com/dotnet/dotnet - 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a + ce3dea8b1d1c12cf4b85999f834052d942d84a6d - + https://github.com/dotnet/dotnet - 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a + ce3dea8b1d1c12cf4b85999f834052d942d84a6d - + https://github.com/dotnet/dotnet - 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a + ce3dea8b1d1c12cf4b85999f834052d942d84a6d - + https://github.com/dotnet/dotnet - 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a + ce3dea8b1d1c12cf4b85999f834052d942d84a6d - + https://github.com/dotnet/dotnet - 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a + ce3dea8b1d1c12cf4b85999f834052d942d84a6d - + https://github.com/dotnet/dotnet - 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a + ce3dea8b1d1c12cf4b85999f834052d942d84a6d - + https://github.com/dotnet/dotnet - 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a + ce3dea8b1d1c12cf4b85999f834052d942d84a6d - + https://github.com/dotnet/dotnet - 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a + ce3dea8b1d1c12cf4b85999f834052d942d84a6d - + https://github.com/dotnet/dotnet - 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a + ce3dea8b1d1c12cf4b85999f834052d942d84a6d - + https://github.com/dotnet/dotnet - 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a + ce3dea8b1d1c12cf4b85999f834052d942d84a6d - + https://github.com/dotnet/dotnet - 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a + ce3dea8b1d1c12cf4b85999f834052d942d84a6d - + https://github.com/dotnet/dotnet - 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a + ce3dea8b1d1c12cf4b85999f834052d942d84a6d - + https://github.com/dotnet/dotnet - 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a + ce3dea8b1d1c12cf4b85999f834052d942d84a6d - + https://github.com/dotnet/dotnet - 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a + ce3dea8b1d1c12cf4b85999f834052d942d84a6d diff --git a/eng/Versions.props b/eng/Versions.props index 65546f1b185..14afd7d733e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,11 +3,11 @@ - 10 + 11 0 0 - rc - 3 + alpha + 1 $(MajorVersion).$(MinorVersion).$(PatchVersion) diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index cb4ccc023a3..748c4f07a64 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -73,6 +73,8 @@ jobs: templateContext: ${{ parameters.templateContext }} variables: + - name: AllowPtrToDetectTestRunRetryFiles + value: true - ${{ if ne(parameters.enableTelemetry, 'false') }}: - name: DOTNET_CLI_TELEMETRY_PROFILE value: '$(Build.Repository.Uri)' diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 58b7a76814e..76baf5c2725 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -3,7 +3,7 @@ parameters: sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] binlogPath: artifacts/log/Debug/Build.binlog - condition: '' + condition: eq(variables['Build.SourceBranch'], 'refs/heads/main') dependsOn: '' pool: '' is1ESPipeline: '' @@ -41,4 +41,4 @@ jobs: - template: /eng/common/core-templates/steps/source-index-stage1-publish.yml parameters: - binLogPath: ${{ parameters.binLogPath }} \ No newline at end of file + binLogPath: ${{ parameters.binLogPath }} diff --git a/global.json b/global.json index d434e3a61e3..1d1f7bf637f 100644 --- a/global.json +++ b/global.json @@ -24,11 +24,11 @@ "runner": "Microsoft.Testing.Platform" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25603.106", - "Microsoft.DotNet.CMake.Sdk": "11.0.0-beta.25603.106", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25603.106", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25608.101", + "Microsoft.DotNet.CMake.Sdk": "11.0.0-beta.25608.101", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25608.101", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", - "Microsoft.NET.Sdk.IL": "10.0.0-rc.3.25603.106" + "Microsoft.NET.Sdk.IL": "11.0.0-alpha.1.25608.101" }, "native-tools": { "cmake": "latest" diff --git a/src/System.Private.Windows.Core/tests/System.Private.Windows.Core.Tests/System/TypeExtensionsTests.cs b/src/System.Private.Windows.Core/tests/System.Private.Windows.Core.Tests/System/TypeExtensionsTests.cs index 4e5d5537d2c..cb621b664aa 100644 --- a/src/System.Private.Windows.Core/tests/System.Private.Windows.Core.Tests/System/TypeExtensionsTests.cs +++ b/src/System.Private.Windows.Core/tests/System.Private.Windows.Core.Tests/System/TypeExtensionsTests.cs @@ -92,8 +92,8 @@ private class MyClass { new List(), [ - "System.Collections.Generic.List`1[[System.Tests.TypeExtensionsTests+MyClass, System.Private.Windows.Core.Tests, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", - "System.Tests.TypeExtensionsTests+MyClass, System.Private.Windows.Core.Tests, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" + "System.Collections.Generic.List`1[[System.Tests.TypeExtensionsTests+MyClass, System.Private.Windows.Core.Tests, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "System.Tests.TypeExtensionsTests+MyClass, System.Private.Windows.Core.Tests, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" ] } };