From 4aaea1a59e498b4ee36ed08f4669daa6dd3886a9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 4 Nov 2022 12:09:06 +0000 Subject: [PATCH 01/15] Update dependencies from https://github.com/dotnet/windowsdesktop build 20221103.1 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.0-alpha.1.22552.1 -> To Version 8.0.0-alpha.1.22553.1 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.0-alpha.1.22551.2 -> To Version 8.0.0-alpha.1.22552.1 (parent: Microsoft.WindowsDesktop.App.Ref --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9068e941696a..71643c5852bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -134,25 +134,25 @@ <Uri>https://github.com/dotnet/runtime</Uri> <Sha>bdd67af67dbf43c0f5e9151b98dc100b9555898a</Sha> </Dependency> - <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-alpha.1.22552.1"> + <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-alpha.1.22553.1"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>9162860562ca3b6a02d2d5683c12a668058727d8</Sha> + <Sha>16ce189e074d32de436819057b8a791ba04d5141</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22552.1"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22553.1"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>9162860562ca3b6a02d2d5683c12a668058727d8</Sha> + <Sha>16ce189e074d32de436819057b8a791ba04d5141</Sha> </Dependency> - <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-alpha.1.22552.1"> + <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-alpha.1.22553.1"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>9162860562ca3b6a02d2d5683c12a668058727d8</Sha> + <Sha>16ce189e074d32de436819057b8a791ba04d5141</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22552.1"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22553.1"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>9162860562ca3b6a02d2d5683c12a668058727d8</Sha> + <Sha>16ce189e074d32de436819057b8a791ba04d5141</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.0-alpha.1.22551.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref"> + <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.0-alpha.1.22552.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref"> <Uri>https://github.com/dotnet/wpf</Uri> - <Sha>959913ec4f81cc388928fad0c95840bf3ee4962b</Sha> + <Sha>d9bbf9099382c12ab071d195a4b4890adc78c00e</Sha> </Dependency> <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-alpha.1.22552.16"> <Uri>https://github.com/dotnet/aspnetcore</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 4f649c8723e8..7bb2d71da950 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,7 +166,7 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/wpf --> - <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.0-alpha.1.22551.2</MicrosoftNETSdkWindowsDesktopPackageVersion> + <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.0-alpha.1.22552.1</MicrosoftNETSdkWindowsDesktopPackageVersion> </PropertyGroup> <PropertyGroup Label="Manually updated"> <!-- Dependencies from https://github.com/microsoft/MSBuildLocator --> From 5e85f84723947492fae6971677e3047f86af1ed5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Nov 2022 12:22:18 +0000 Subject: [PATCH 02/15] Update dependencies from https://github.com/dotnet/windowsdesktop build 20221104.1 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.0-alpha.1.22552.1 -> To Version 8.0.0-alpha.1.22554.1 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.0-alpha.1.22551.2 -> To Version 8.0.0-alpha.1.22553.1 (parent: Microsoft.WindowsDesktop.App.Ref --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 71643c5852bc..88d5b3fd8abd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -134,25 +134,25 @@ <Uri>https://github.com/dotnet/runtime</Uri> <Sha>bdd67af67dbf43c0f5e9151b98dc100b9555898a</Sha> </Dependency> - <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-alpha.1.22553.1"> + <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-alpha.1.22554.1"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>16ce189e074d32de436819057b8a791ba04d5141</Sha> + <Sha>2bab859cc64276adf96fa12e350032238192d80c</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22553.1"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22554.1"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>16ce189e074d32de436819057b8a791ba04d5141</Sha> + <Sha>2bab859cc64276adf96fa12e350032238192d80c</Sha> </Dependency> - <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-alpha.1.22553.1"> + <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-alpha.1.22554.1"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>16ce189e074d32de436819057b8a791ba04d5141</Sha> + <Sha>2bab859cc64276adf96fa12e350032238192d80c</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22553.1"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22554.1"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>16ce189e074d32de436819057b8a791ba04d5141</Sha> + <Sha>2bab859cc64276adf96fa12e350032238192d80c</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.0-alpha.1.22552.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref"> + <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.0-alpha.1.22553.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref"> <Uri>https://github.com/dotnet/wpf</Uri> - <Sha>d9bbf9099382c12ab071d195a4b4890adc78c00e</Sha> + <Sha>1e8fd6d358929a5f17471266876135cbfd1ef412</Sha> </Dependency> <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-alpha.1.22552.16"> <Uri>https://github.com/dotnet/aspnetcore</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 7bb2d71da950..4eb7afe60ebd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,7 +166,7 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/wpf --> - <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.0-alpha.1.22552.1</MicrosoftNETSdkWindowsDesktopPackageVersion> + <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.0-alpha.1.22553.1</MicrosoftNETSdkWindowsDesktopPackageVersion> </PropertyGroup> <PropertyGroup Label="Manually updated"> <!-- Dependencies from https://github.com/microsoft/MSBuildLocator --> From 108716ae27854ac4142bb507266169ed1f04d6ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 6 Nov 2022 13:11:30 +0000 Subject: [PATCH 03/15] Update dependencies from https://github.com/dotnet/windowsdesktop build 20221105.1 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.0-alpha.1.22552.1 -> To Version 8.0.0-alpha.1.22555.1 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.0-alpha.1.22551.2 -> To Version 8.0.0-alpha.1.22554.1 (parent: Microsoft.WindowsDesktop.App.Ref --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88d5b3fd8abd..014dfde94177 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -134,25 +134,25 @@ <Uri>https://github.com/dotnet/runtime</Uri> <Sha>bdd67af67dbf43c0f5e9151b98dc100b9555898a</Sha> </Dependency> - <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-alpha.1.22554.1"> + <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-alpha.1.22555.1"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>2bab859cc64276adf96fa12e350032238192d80c</Sha> + <Sha>0994bbd72660eb5790c1c7b07371ade26da1f0fc</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22554.1"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22555.1"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>2bab859cc64276adf96fa12e350032238192d80c</Sha> + <Sha>0994bbd72660eb5790c1c7b07371ade26da1f0fc</Sha> </Dependency> - <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-alpha.1.22554.1"> + <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-alpha.1.22555.1"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>2bab859cc64276adf96fa12e350032238192d80c</Sha> + <Sha>0994bbd72660eb5790c1c7b07371ade26da1f0fc</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22554.1"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22555.1"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>2bab859cc64276adf96fa12e350032238192d80c</Sha> + <Sha>0994bbd72660eb5790c1c7b07371ade26da1f0fc</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.0-alpha.1.22553.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref"> + <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.0-alpha.1.22554.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref"> <Uri>https://github.com/dotnet/wpf</Uri> - <Sha>1e8fd6d358929a5f17471266876135cbfd1ef412</Sha> + <Sha>8beaeec457db1883122595f16ac5d3001e7471a3</Sha> </Dependency> <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-alpha.1.22552.16"> <Uri>https://github.com/dotnet/aspnetcore</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 4eb7afe60ebd..30097cafdb5f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,7 +166,7 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/wpf --> - <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.0-alpha.1.22553.1</MicrosoftNETSdkWindowsDesktopPackageVersion> + <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.0-alpha.1.22554.1</MicrosoftNETSdkWindowsDesktopPackageVersion> </PropertyGroup> <PropertyGroup Label="Manually updated"> <!-- Dependencies from https://github.com/microsoft/MSBuildLocator --> From 8713c24306a50e0ab477b2bfda466053655e1e0a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 7 Nov 2022 13:15:41 +0000 Subject: [PATCH 04/15] Update dependencies from https://github.com/dotnet/windowsdesktop build 20221106.1 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.0-alpha.1.22552.1 -> To Version 8.0.0-alpha.1.22556.1 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.0-alpha.1.22551.2 -> To Version 8.0.0-alpha.1.22555.2 (parent: Microsoft.WindowsDesktop.App.Ref --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 014dfde94177..8bb4544597e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -134,25 +134,25 @@ <Uri>https://github.com/dotnet/runtime</Uri> <Sha>bdd67af67dbf43c0f5e9151b98dc100b9555898a</Sha> </Dependency> - <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-alpha.1.22555.1"> + <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-alpha.1.22556.1"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>0994bbd72660eb5790c1c7b07371ade26da1f0fc</Sha> + <Sha>8a5a020fca3b73fa6a180fe20cd3c10810b1d49a</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22555.1"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22556.1"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>0994bbd72660eb5790c1c7b07371ade26da1f0fc</Sha> + <Sha>8a5a020fca3b73fa6a180fe20cd3c10810b1d49a</Sha> </Dependency> - <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-alpha.1.22555.1"> + <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-alpha.1.22556.1"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>0994bbd72660eb5790c1c7b07371ade26da1f0fc</Sha> + <Sha>8a5a020fca3b73fa6a180fe20cd3c10810b1d49a</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22555.1"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22556.1"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>0994bbd72660eb5790c1c7b07371ade26da1f0fc</Sha> + <Sha>8a5a020fca3b73fa6a180fe20cd3c10810b1d49a</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.0-alpha.1.22554.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref"> + <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.0-alpha.1.22555.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref"> <Uri>https://github.com/dotnet/wpf</Uri> - <Sha>8beaeec457db1883122595f16ac5d3001e7471a3</Sha> + <Sha>72ee58c43b54b34f39be4b43c4227bf4fc6f7150</Sha> </Dependency> <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-alpha.1.22552.16"> <Uri>https://github.com/dotnet/aspnetcore</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 30097cafdb5f..ad272386a1e8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,7 +166,7 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/wpf --> - <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.0-alpha.1.22554.1</MicrosoftNETSdkWindowsDesktopPackageVersion> + <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.0-alpha.1.22555.2</MicrosoftNETSdkWindowsDesktopPackageVersion> </PropertyGroup> <PropertyGroup Label="Manually updated"> <!-- Dependencies from https://github.com/microsoft/MSBuildLocator --> From de15ec26543403d6899ce8a439138dd7175ceb90 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 8 Nov 2022 13:16:15 +0000 Subject: [PATCH 05/15] Update dependencies from https://github.com/dotnet/windowsdesktop build 20221107.1 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.0-alpha.1.22552.1 -> To Version 8.0.0-alpha.1.22557.1 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.0-alpha.1.22551.2 -> To Version 8.0.0-alpha.1.22556.1 (parent: Microsoft.WindowsDesktop.App.Ref --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8bb4544597e6..dace636fb71c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -134,25 +134,25 @@ <Uri>https://github.com/dotnet/runtime</Uri> <Sha>bdd67af67dbf43c0f5e9151b98dc100b9555898a</Sha> </Dependency> - <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-alpha.1.22556.1"> + <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-alpha.1.22557.1"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>8a5a020fca3b73fa6a180fe20cd3c10810b1d49a</Sha> + <Sha>50c03870391a157757ea9e0b10f5552bdf6d9180</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22556.1"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22557.1"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>8a5a020fca3b73fa6a180fe20cd3c10810b1d49a</Sha> + <Sha>50c03870391a157757ea9e0b10f5552bdf6d9180</Sha> </Dependency> - <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-alpha.1.22556.1"> + <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-alpha.1.22557.1"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>8a5a020fca3b73fa6a180fe20cd3c10810b1d49a</Sha> + <Sha>50c03870391a157757ea9e0b10f5552bdf6d9180</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22556.1"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22557.1"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>8a5a020fca3b73fa6a180fe20cd3c10810b1d49a</Sha> + <Sha>50c03870391a157757ea9e0b10f5552bdf6d9180</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.0-alpha.1.22555.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref"> + <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.0-alpha.1.22556.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref"> <Uri>https://github.com/dotnet/wpf</Uri> - <Sha>72ee58c43b54b34f39be4b43c4227bf4fc6f7150</Sha> + <Sha>71fef8ef14c1c4245bbc826ffb4c3efb992b0fdf</Sha> </Dependency> <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-alpha.1.22552.16"> <Uri>https://github.com/dotnet/aspnetcore</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index ad272386a1e8..a0fc512ef767 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,7 +166,7 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/wpf --> - <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.0-alpha.1.22555.2</MicrosoftNETSdkWindowsDesktopPackageVersion> + <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.0-alpha.1.22556.1</MicrosoftNETSdkWindowsDesktopPackageVersion> </PropertyGroup> <PropertyGroup Label="Manually updated"> <!-- Dependencies from https://github.com/microsoft/MSBuildLocator --> From ae6d5f42a805541be8008f603283565879c44743 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 13:16:34 +0000 Subject: [PATCH 06/15] Update dependencies from https://github.com/dotnet/windowsdesktop build 20221108.1 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.0-alpha.1.22552.1 -> To Version 8.0.0-alpha.1.22558.1 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.0-alpha.1.22551.2 -> To Version 8.0.0-alpha.1.22557.1 (parent: Microsoft.WindowsDesktop.App.Ref --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dace636fb71c..6f665d8c6d8f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -134,25 +134,25 @@ <Uri>https://github.com/dotnet/runtime</Uri> <Sha>bdd67af67dbf43c0f5e9151b98dc100b9555898a</Sha> </Dependency> - <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-alpha.1.22557.1"> + <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-alpha.1.22558.1"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>50c03870391a157757ea9e0b10f5552bdf6d9180</Sha> + <Sha>1dcd5a1190a51c658805a2fd4be0c3ebe18465f1</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22557.1"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22558.1"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>50c03870391a157757ea9e0b10f5552bdf6d9180</Sha> + <Sha>1dcd5a1190a51c658805a2fd4be0c3ebe18465f1</Sha> </Dependency> - <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-alpha.1.22557.1"> + <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-alpha.1.22558.1"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>50c03870391a157757ea9e0b10f5552bdf6d9180</Sha> + <Sha>1dcd5a1190a51c658805a2fd4be0c3ebe18465f1</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22557.1"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22558.1"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>50c03870391a157757ea9e0b10f5552bdf6d9180</Sha> + <Sha>1dcd5a1190a51c658805a2fd4be0c3ebe18465f1</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.0-alpha.1.22556.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref"> + <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.0-alpha.1.22557.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref"> <Uri>https://github.com/dotnet/wpf</Uri> - <Sha>71fef8ef14c1c4245bbc826ffb4c3efb992b0fdf</Sha> + <Sha>1aab9e3f42dbf550797bff97a32f2dbfb61a3198</Sha> </Dependency> <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-alpha.1.22552.16"> <Uri>https://github.com/dotnet/aspnetcore</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index a0fc512ef767..fe9a636637bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,7 +166,7 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/wpf --> - <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.0-alpha.1.22556.1</MicrosoftNETSdkWindowsDesktopPackageVersion> + <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.0-alpha.1.22557.1</MicrosoftNETSdkWindowsDesktopPackageVersion> </PropertyGroup> <PropertyGroup Label="Manually updated"> <!-- Dependencies from https://github.com/microsoft/MSBuildLocator --> From f27b5518f0f8008fe19dcbf22ea326ce5ba8adbe Mon Sep 17 00:00:00 2001 From: Devendar Reddy Adulla <dreddy@microsoft.com> Date: Mon, 21 Nov 2022 12:16:03 -0800 Subject: [PATCH 07/15] Update VS version. --- .../GivenThatWeWantToBuildAWindowsDesktopProject.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs index 679c7047c76c..b4bca55d6c8b 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs @@ -20,7 +20,7 @@ public class GivenThatWeWantToBuildAWindowsDesktopProject : SdkTest public GivenThatWeWantToBuildAWindowsDesktopProject(ITestOutputHelper log) : base(log) {} - [WindowsOnlyRequiresMSBuildVersionTheory("16.7.0-preview-20310-07")] + [WindowsOnlyRequiresMSBuildVersionTheory("16.7.0")] [InlineData("UseWindowsForms")] [InlineData("UseWPF")] public void It_errors_when_missing_windows_target_platform(string propertyName) @@ -44,7 +44,7 @@ public void It_errors_when_missing_windows_target_platform(string propertyName) .HaveStdOutContaining("NETSDK1136"); } - [WindowsOnlyRequiresMSBuildVersionTheory("16.7.0-preview-20310-07")] + [WindowsOnlyRequiresMSBuildVersionTheory("16.7.0")] [InlineData("UseWindowsForms")] [InlineData("UseWPF")] public void It_errors_when_missing_transitive_windows_target_platform(string propertyName) From d828b2ca9aadb979e44d40f8aee37eaaf6a10a51 Mon Sep 17 00:00:00 2001 From: Devendar Reddy Adulla <dreddy@microsoft.com> Date: Mon, 21 Nov 2022 14:12:58 -0800 Subject: [PATCH 08/15] Update target framework version. --- src/Tests/Microsoft.NET.TestFramework/ToolsetInfo.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Tests/Microsoft.NET.TestFramework/ToolsetInfo.cs b/src/Tests/Microsoft.NET.TestFramework/ToolsetInfo.cs index 01c27aa2b67a..cd64082638cc 100644 --- a/src/Tests/Microsoft.NET.TestFramework/ToolsetInfo.cs +++ b/src/Tests/Microsoft.NET.TestFramework/ToolsetInfo.cs @@ -17,10 +17,10 @@ namespace Microsoft.NET.TestFramework { public class ToolsetInfo { - public const string CurrentTargetFramework = "net7.0"; - public const string CurrentTargetFrameworkVersion = "7.0"; - public const string NextTargetFramework = "net8.0"; - public const string NextTargetFrameworkVersion = "8.0"; + public const string CurrentTargetFramework = "net8.0"; + public const string CurrentTargetFrameworkVersion = "8.0"; + public const string NextTargetFramework = "net9.0"; + public const string NextTargetFrameworkVersion = "9.0"; public const string LatestWinRuntimeIdentifier = "win10"; public const string LatestLinuxRuntimeIdentifier = "ubuntu.22.04"; From 85b91a4959fd621e922a9f1940266763738d4ffc Mon Sep 17 00:00:00 2001 From: Devendar Reddy Adulla <dreddy@microsoft.com> Date: Mon, 21 Nov 2022 17:08:52 -0800 Subject: [PATCH 09/15] Revert target framework change. --- src/Tests/Microsoft.NET.TestFramework/ToolsetInfo.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Tests/Microsoft.NET.TestFramework/ToolsetInfo.cs b/src/Tests/Microsoft.NET.TestFramework/ToolsetInfo.cs index cd64082638cc..01c27aa2b67a 100644 --- a/src/Tests/Microsoft.NET.TestFramework/ToolsetInfo.cs +++ b/src/Tests/Microsoft.NET.TestFramework/ToolsetInfo.cs @@ -17,10 +17,10 @@ namespace Microsoft.NET.TestFramework { public class ToolsetInfo { - public const string CurrentTargetFramework = "net8.0"; - public const string CurrentTargetFrameworkVersion = "8.0"; - public const string NextTargetFramework = "net9.0"; - public const string NextTargetFrameworkVersion = "9.0"; + public const string CurrentTargetFramework = "net7.0"; + public const string CurrentTargetFrameworkVersion = "7.0"; + public const string NextTargetFramework = "net8.0"; + public const string NextTargetFrameworkVersion = "8.0"; public const string LatestWinRuntimeIdentifier = "win10"; public const string LatestLinuxRuntimeIdentifier = "ubuntu.22.04"; From ecba8534b6aab1ea919379bcb8d07c8c273003da Mon Sep 17 00:00:00 2001 From: Marc Paine <marcpop@microsoft.com> Date: Wed, 23 Nov 2022 11:33:05 -0800 Subject: [PATCH 10/15] Try updating to the next target framework for one test. --- .../GivenThatWeWantToBuildAWindowsDesktopProject.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs index b4bca55d6c8b..7d7660dfc8a4 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs @@ -25,7 +25,7 @@ public GivenThatWeWantToBuildAWindowsDesktopProject(ITestOutputHelper log) : bas [InlineData("UseWPF")] public void It_errors_when_missing_windows_target_platform(string propertyName) { - var targetFramework = ToolsetInfo.CurrentTargetFramework; + var targetFramework = ToolsetInfo.NextTargetFramework; TestProject testProject = new TestProject() { Name = "MissingTargetPlatform", From aa5fed9fadd2daba8c4e2745cdcf84bd218720d3 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald <raines@microsoft.com> Date: Tue, 29 Nov 2022 16:39:24 -0600 Subject: [PATCH 11/15] Update LKG SDK to 8.0.100-alpha.1.22579.5 This has dotnet/runtime#74157, which is needed to use compiled-against-8.0 tasks. --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index fdfd38fb4f3d..fd1eb52f779c 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-alpha.1.22556.1", + "dotnet": "8.0.100-alpha.1.22579.5", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" From c38852186912b8718e09b83b3b84ede6f7d1d263 Mon Sep 17 00:00:00 2001 From: Marc Paine <marcpop@microsoft.com> Date: Tue, 29 Nov 2022 16:08:39 -0800 Subject: [PATCH 12/15] Update the test version of 7.0 installed to 7.0.0 --- eng/restore-toolset.ps1 | 2 +- eng/restore-toolset.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/restore-toolset.ps1 b/eng/restore-toolset.ps1 index 259871b7e72f..d74016895792 100644 --- a/eng/restore-toolset.ps1 +++ b/eng/restore-toolset.ps1 @@ -22,7 +22,7 @@ function InitializeCustomSDKToolset { InstallDotNetSharedFramework "3.1.0" InstallDotNetSharedFramework "5.0.0" InstallDotNetSharedFramework "6.0.0" - InstallDotNetSharedFramework "7.0.0-rc.2.22472.3" + InstallDotNetSharedFramework "7.0.0" CreateBuildEnvScripts InstallNuget diff --git a/eng/restore-toolset.sh b/eng/restore-toolset.sh index efe83bbb8fee..da38088d5906 100644 --- a/eng/restore-toolset.sh +++ b/eng/restore-toolset.sh @@ -30,7 +30,7 @@ function InitializeCustomSDKToolset { InstallDotNetSharedFramework "3.1.0" InstallDotNetSharedFramework "5.0.0" InstallDotNetSharedFramework "6.0.0" - InstallDotNetSharedFramework "7.0.0-rc.2.22472.3" + InstallDotNetSharedFramework "7.0.0" CreateBuildEnvScript } From e914c97e75baa95033defce9e356d59d9a2780d9 Mon Sep 17 00:00:00 2001 From: Gang Wang <v-gaw@microsoft.com> Date: Thu, 1 Dec 2022 10:44:16 +0000 Subject: [PATCH 13/15] Update the short name of NUnit Playwright in approvals --- ...DotnetNewCompleteTests.CanDoTabCompletion.Linux.verified.txt | 2 +- .../DotnetNewCompleteTests.CanDoTabCompletion.OSX.verified.txt | 2 +- ...tnetNewCompleteTests.CanDoTabCompletion.Windows.verified.txt | 2 +- ....BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt | 2 +- ...ts.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt | 2 +- ...asicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt | 2 +- ...ListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt | 2 +- ...ewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt | 2 +- ...stTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Linux.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Linux.verified.txt index 3cf82153a912..5b28af17b7ee 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Linux.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Linux.verified.txt @@ -14,7 +14,7 @@ mstest-playwright mvc nugetconfig nunit -NUnit-playwright +nunit-playwright nunit-test page proto diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.OSX.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.OSX.verified.txt index 990c6fde5222..538cc359d482 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.OSX.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.OSX.verified.txt @@ -14,7 +14,7 @@ mstest-playwright mvc nugetconfig nunit -NUnit-playwright +nunit-playwright nunit-test page proto diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Windows.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Windows.verified.txt index 0fe4d7b7a671..3272d8b53741 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Windows.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Windows.verified.txt @@ -14,7 +14,7 @@ mstest-playwright mvc nugetconfig nunit -NUnit-playwright +nunit-playwright nunit-test page proto diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt index f9ae98d4a394..9a81ab25f1fd 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt @@ -30,7 +30,7 @@ MVC ViewStart viewstart [C#] NuGet Config nugetconfig,nuget.config Config NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit -NUnit Playwright Test Project NUnit-playwright [C#] Test/NUnit/Playwright +NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright Protocol Buffer File proto Web/gRPC Razor Class Library razorclasslib [C#] Web/Razor/Library Razor Component razorcomponent [C#] Web/ASP.NET diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt index f9ae98d4a394..9a81ab25f1fd 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt @@ -30,7 +30,7 @@ MVC ViewStart viewstart [C#] NuGet Config nugetconfig,nuget.config Config NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit -NUnit Playwright Test Project NUnit-playwright [C#] Test/NUnit/Playwright +NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright Protocol Buffer File proto Web/gRPC Razor Class Library razorclasslib [C#] Web/Razor/Library Razor Component razorcomponent [C#] Web/ASP.NET diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt index 74b40fc33918..9fbdcf2657d2 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt @@ -30,7 +30,7 @@ MVC ViewStart viewstart [C#] NuGet Config nugetconfig,nuget.config Config NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit -NUnit Playwright Test Project NUnit-playwright [C#] Test/NUnit/Playwright +NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright Protocol Buffer File proto Web/gRPC Razor Class Library razorclasslib [C#] Web/Razor/Library Razor Component razorcomponent [C#] Web/ASP.NET diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt index cd0c094a73e8..2343f2c52c51 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt @@ -26,7 +26,7 @@ MVC ViewStart viewstart [C#] NuGet Config nugetconfig,nuget.config Config NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit -NUnit Playwright Test Project NUnit-playwright [C#] Test/NUnit/Playwright +NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright Protocol Buffer File proto Web/gRPC Razor Class Library razorclasslib [C#] Web/Razor/Library Razor Component razorcomponent [C#] Web/ASP.NET diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt index cd0c094a73e8..2343f2c52c51 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt @@ -26,7 +26,7 @@ MVC ViewStart viewstart [C#] NuGet Config nugetconfig,nuget.config Config NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit -NUnit Playwright Test Project NUnit-playwright [C#] Test/NUnit/Playwright +NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright Protocol Buffer File proto Web/gRPC Razor Class Library razorclasslib [C#] Web/Razor/Library Razor Component razorcomponent [C#] Web/ASP.NET diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt index 72551017d6f3..7433d292bfff 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt @@ -26,7 +26,7 @@ MVC ViewStart viewstart [C#] NuGet Config nugetconfig,nuget.config Config NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit -NUnit Playwright Test Project NUnit-playwright [C#] Test/NUnit/Playwright +NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright Protocol Buffer File proto Web/gRPC Razor Class Library razorclasslib [C#] Web/Razor/Library Razor Component razorcomponent [C#] Web/ASP.NET From b0c6d3bcd55187af26b38d50815267b0aeae901a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 15:37:15 +0000 Subject: [PATCH 14/15] Update dependencies from https://github.com/dotnet/windowsdesktop build 20221202.2 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.0-alpha.1.22552.1 -> To Version 8.0.0-alpha.1.22602.2 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.0-alpha.1.22551.2 -> To Version 8.0.0-alpha.1.22601.6 (parent: Microsoft.WindowsDesktop.App.Ref --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d2eec386680..1dbd8ca0d20c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -134,25 +134,25 @@ <Uri>https://github.com/dotnet/runtime</Uri> <Sha>1771d63827387b49dcd8c33b95f1512f4f11e368</Sha> </Dependency> - <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-alpha.1.22558.1"> + <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-alpha.1.22602.2"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>1dcd5a1190a51c658805a2fd4be0c3ebe18465f1</Sha> + <Sha>8461d6590a4b96d636037868bd5ac7ee2904dd33</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22558.1"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.22602.2"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>1dcd5a1190a51c658805a2fd4be0c3ebe18465f1</Sha> + <Sha>8461d6590a4b96d636037868bd5ac7ee2904dd33</Sha> </Dependency> - <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-alpha.1.22558.1"> + <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-alpha.1.22602.2"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>1dcd5a1190a51c658805a2fd4be0c3ebe18465f1</Sha> + <Sha>8461d6590a4b96d636037868bd5ac7ee2904dd33</Sha> </Dependency> - <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22558.1"> + <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.22602.2"> <Uri>https://github.com/dotnet/windowsdesktop</Uri> - <Sha>1dcd5a1190a51c658805a2fd4be0c3ebe18465f1</Sha> + <Sha>8461d6590a4b96d636037868bd5ac7ee2904dd33</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.0-alpha.1.22557.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref"> + <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.0-alpha.1.22601.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref"> <Uri>https://github.com/dotnet/wpf</Uri> - <Sha>1aab9e3f42dbf550797bff97a32f2dbfb61a3198</Sha> + <Sha>104e539716f681f0f54d35419bc9b1721b2bb02b</Sha> </Dependency> <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-alpha.1.22578.10"> <Uri>https://github.com/dotnet/aspnetcore</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index e941e3afe182..e27fdc856dc5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -167,7 +167,7 @@ </PropertyGroup> <PropertyGroup> <!-- Dependencies from https://github.com/dotnet/wpf --> - <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.0-alpha.1.22557.1</MicrosoftNETSdkWindowsDesktopPackageVersion> + <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.0-alpha.1.22601.6</MicrosoftNETSdkWindowsDesktopPackageVersion> </PropertyGroup> <PropertyGroup Label="Manually updated"> <!-- Dependencies from https://github.com/microsoft/MSBuildLocator --> From 93822eae50183838e8c6272a06799bb5545e8b54 Mon Sep 17 00:00:00 2001 From: Marc Paine <marcpop@microsoft.com> Date: Fri, 2 Dec 2022 10:14:23 -0800 Subject: [PATCH 15/15] Fix test by not restoring and avoiding a different error that's more confusing --- .../GivenThatWeWantToBuildAWindowsDesktopProject.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs index acba5758144c..244c80105494 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs @@ -34,10 +34,11 @@ public void It_errors_when_missing_windows_target_platform(string propertyName) testProject.AdditionalProperties[propertyName] = "true"; testProject.AdditionalProperties["TargetPlatformIdentifier"] = "custom"; // Make sure we don't get windows implicitly set as the TPI testProject.AdditionalProperties["TargetPlatformSupported"] = "true"; + testProject.AdditionalProperties["TargetPlatformMoniker"] = "custom,Version="; //Make sure we avoid implicitly setting an invalid TPV var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: propertyName); var buildCommand = new BuildCommand(testAsset); - buildCommand.Execute() + buildCommand.ExecuteWithoutRestore() .Should() .Fail() .And