diff --git a/Microsoft.Dotnet.Wpf.sln b/Microsoft.Dotnet.Wpf.sln index 712d90ca334..7ebede6c62b 100644 --- a/Microsoft.Dotnet.Wpf.sln +++ b/Microsoft.Dotnet.Wpf.sln @@ -1932,9 +1932,9 @@ Global {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x64.ActiveCfg = Debug|x64 {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x64.Build.0 = Debug|x64 {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x64.Deploy.0 = Debug|x64 - {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x86.ActiveCfg = Debug|Win32 - {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x86.Build.0 = Debug|Win32 - {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x86.Deploy.0 = Debug|Win32 + {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x86.ActiveCfg = Debug|x86 + {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x86.Build.0 = Debug|x86 + {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x86.Deploy.0 = Debug|x86 {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|Any CPU.ActiveCfg = Release|Win32 {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|Any CPU.Build.0 = Release|Win32 {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|Any CPU.Deploy.0 = Release|Win32 @@ -1943,9 +1943,9 @@ Global {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x64.ActiveCfg = Release|x64 {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x64.Build.0 = Release|x64 {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x64.Deploy.0 = Release|x64 - {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x86.ActiveCfg = Release|Win32 - {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x86.Build.0 = Release|Win32 - {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x86.Deploy.0 = Release|Win32 + {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x86.ActiveCfg = Release|x86 + {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x86.Build.0 = Release|x86 + {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x86.Deploy.0 = Release|x86 {3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}.Debug|Any CPU.Build.0 = Debug|Any CPU {3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}.Debug|ARM64.ActiveCfg = Debug|arm64 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c411b601bd4..47bfb51f231 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,159 +1,159 @@ - + https://github.com/dotnet/winforms - 0aa3a4dfea1dad493ecbfe15cd513604468b3916 + 5a25f4f270cc9e83f52a6f69c749f025bc068b1a - + https://github.com/dotnet/winforms - 0aa3a4dfea1dad493ecbfe15cd513604468b3916 + 5a25f4f270cc9e83f52a6f69c749f025bc068b1a - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 2a182869453880d38709ca22271a1c08875db194 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 35e4aad602ee3c28330e94746cfd4e0d4569b66f - + https://github.com/dotnet/winforms - 0aa3a4dfea1dad493ecbfe15cd513604468b3916 + 5a25f4f270cc9e83f52a6f69c749f025bc068b1a diff --git a/eng/Versions.props b/eng/Versions.props index 224ba4dbfa4..cd92886ac41 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,26 +21,26 @@ - 9.0.0-preview.5.24268.1 + 9.0.0-preview.6.24277.2 - 9.0.0-preview.5.24265.2 - 9.0.0-preview.5.24265.2 - 9.0.0-preview.5.24265.2 - 9.0.0-preview.5.24265.2 - 9.0.0-preview.5.24265.2 - 9.0.0-preview.5.24265.2 - 9.0.0-preview.5.24265.2 - 9.0.0-preview.5.24268.1 - 9.0.0-preview.5.24265.2 - 9.0.0-preview.5.24265.2 - 9.0.0-preview.5.24265.2 + 9.0.0-preview.5.24275.1 + 9.0.0-preview.5.24275.1 + 9.0.0-preview.5.24275.1 + 9.0.0-preview.5.24275.1 + 9.0.0-preview.5.24275.1 + 9.0.0-preview.5.24275.1 + 9.0.0-preview.5.24275.1 + 9.0.0-preview.6.24277.2 + 9.0.0-preview.5.24275.1 + 9.0.0-preview.5.24275.1 + 9.0.0-preview.5.24275.1 4.6.0-preview4.19176.11 - 9.0.0-preview.5.24265.2 - 9.0.0-preview.5.24265.2 - 9.0.0-preview.5.24265.2 - 9.0.0-preview.5.24265.2 + 9.0.0-preview.5.24275.1 + 9.0.0-preview.5.24275.1 + 9.0.0-preview.5.24275.1 + 9.0.0-preview.5.24275.1 diff --git a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props index cfd681c5a28..ff7880c6991 100644 --- a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props +++ b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props @@ -1,14 +1,7 @@ - - $(MicrosoftNETCoreAppRuntimewinx64Version) - - true - + diff --git a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets index 6508da7948d..95cb707750b 100644 --- a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets +++ b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets @@ -1,27 +1,27 @@ - - - - + $(MicrosoftNETCoreAppRefVersion) - @@ -29,7 +29,10 @@ - - + $(MicrosoftNETCoreAppRuntimewinx64Version)