diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef5d0842a80..5c33ba8f23f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,181 +1,185 @@ - + https://github.com/dotnet/winforms - 8cbf7ea9a86cb42828fdc5af826f986bce3d2e98 + 77be8127d323f322a9c168acaf5920d84271096c - + https://github.com/dotnet/winforms - 8cbf7ea9a86cb42828fdc5af826f986bce3d2e98 + 77be8127d323f322a9c168acaf5920d84271096c - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - b1b9369649321c91ab7c65e8a1c0cb8c1c5d17af + 05a90169210897f51f0550c0396ef44240bee390 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 + + + https://github.com/dotnet/runtime + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + 153296b162f6db9f66e850432569977d74a3e867 - + https://github.com/dotnet/winforms - 8cbf7ea9a86cb42828fdc5af826f986bce3d2e98 + 77be8127d323f322a9c168acaf5920d84271096c - + https://github.com/dotnet/arcade - 92a725aa4d9d6c13dc5229597b51b0b165b8b535 + 579b9d3c2a51de22be7685f0bd624bf83265c901 - + https://github.com/dotnet/arcade - 92a725aa4d9d6c13dc5229597b51b0b165b8b535 + 579b9d3c2a51de22be7685f0bd624bf83265c901 - + https://github.com/dotnet/arcade - 92a725aa4d9d6c13dc5229597b51b0b165b8b535 + 579b9d3c2a51de22be7685f0bd624bf83265c901 https://github.com/dotnet/arcade f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 - + https://github.com/dotnet/arcade - 92a725aa4d9d6c13dc5229597b51b0b165b8b535 + 579b9d3c2a51de22be7685f0bd624bf83265c901 https://github.com/dotnet/sourcelink diff --git a/eng/Versions.props b/eng/Versions.props index b17c5a2416b..dbbc39a0406 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,7 +5,7 @@ 0 0 preview - 6 + 7 $(MajorVersion).$(MinorVersion).$(PatchVersion) - 9.0.0-preview.6.24317.1 + 9.0.0-preview.6.24319.5 - 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24317.1 - 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24307.2 + 9.0.0-preview.6.24319.3 + 9.0.0-preview.6.24319.3 + 9.0.0-preview.6.24319.3 + 9.0.0-preview.6.24319.3 + 9.0.0-preview.6.24319.3 + 9.0.0-preview.6.24319.3 + 9.0.0-preview.6.24319.3 + 9.0.0-preview.6.24319.5 + 9.0.0-preview.6.24319.3 + 9.0.0-preview.6.24319.3 + 9.0.0-preview.6.24319.3 4.6.0-preview4.19176.11 - 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24307.2 + 9.0.0-preview.6.24319.3 + 9.0.0-preview.6.24319.3 + 9.0.0-preview.6.24319.3 + 9.0.0-preview.6.24319.3 + 9.0.0-preview.6.24319.3 @@ -49,7 +50,7 @@ 9.0.0-beta.24053.1 - 9.0.0-beta.24314.1 + 9.0.0-beta.24317.3 @@ -107,6 +108,6 @@ System.Reflection.MetadataLoadContext - 9.0.0-preview.6.24314.2 + 9.0.0-preview.7.24320.1 diff --git a/eng/WpfArcadeSdk/tools/TestProjects.targets b/eng/WpfArcadeSdk/tools/TestProjects.targets index 8fdc440ae42..2c8fd22bf80 100644 --- a/eng/WpfArcadeSdk/tools/TestProjects.targets +++ b/eng/WpfArcadeSdk/tools/TestProjects.targets @@ -29,6 +29,7 @@ + diff --git a/global.json b/global.json index 8a64d180ff7..447f0ed11f8 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24314.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24314.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24317.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24317.3" }, "sdk": { "version": "9.0.100-preview.5.24307.3" diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj index 1f871954561..3cdb8174bce 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj @@ -1408,7 +1408,6 @@ - @@ -1422,6 +1421,8 @@ + + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj index 75d9e1c713d..80380ec2120 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj @@ -50,7 +50,6 @@ - @@ -63,6 +62,8 @@ + + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj index e528a95d225..ecb8e8dd265 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj @@ -1403,7 +1403,6 @@ - @@ -1447,6 +1446,8 @@ + + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj index b7ea8c46323..def41db3429 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj @@ -58,7 +58,6 @@ - @@ -90,6 +89,8 @@ + + diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj index 12c475845a1..73ce444dbb0 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj @@ -111,7 +111,6 @@ - @@ -122,6 +121,8 @@ + + diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj b/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj index 7498f329404..c125f185415 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj @@ -38,7 +38,6 @@ - @@ -49,6 +48,8 @@ + +