Update winforms migration sample

dotnet · Nov 21, 2024 · 28ee292 · 28ee292
1 parent 1b7357e
commit 28ee292
Show file tree

Hide file tree

Showing 43 changed files with 57 additions and 40 deletions.
diff --git a/...et8-windows/cs/MatchingGame.Logic/Game.cs → ...net-windows/cs/MatchingGame.Logic/Game.cs b/...et8-windows/cs/MatchingGame.Logic/Game.cs → ...net-windows/cs/MatchingGame.Logic/Game.cs
diff --git a/...ows/cs/MatchingGame.Logic/GameSettings.cs → ...ows/cs/MatchingGame.Logic/GameSettings.cs b/...ows/cs/MatchingGame.Logic/GameSettings.cs → ...ows/cs/MatchingGame.Logic/GameSettings.cs
diff --git a/...chingGame.Logic/MatchingGame.Logic.csproj → ...chingGame.Logic/MatchingGame.Logic.csproj b/...chingGame.Logic/MatchingGame.Logic.csproj → ...chingGame.Logic/MatchingGame.Logic.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Library</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AssemblyTitle>MatchingGame.Logic</AssemblyTitle>

diff --git a/...hingGame.Logic/Properties/AssemblyInfo.cs → ...hingGame.Logic/Properties/AssemblyInfo.cs b/...hingGame.Logic/Properties/AssemblyInfo.cs → ...hingGame.Logic/Properties/AssemblyInfo.cs
diff --git a/...ing-game/net8-windows/cs/MatchingGame.sln → ...hing-game/net-windows/cs/MatchingGame.sln b/...ing-game/net8-windows/cs/MatchingGame.sln → ...hing-game/net-windows/cs/MatchingGame.sln
@@ -1,11 +1,11 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28315.86
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatchingGame", "MatchingGame\MatchingGame.csproj", "{33E7C299-4ABD-4224-9335-3BC70512A1B3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatchingGame", "MatchingGame\MatchingGame.csproj", "{33E7C299-4ABD-4224-9335-3BC70512A1B3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatchingGame.Logic", "MatchingGame.Logic\MatchingGame.Logic.csproj", "{36B3E6E2-A9AE-4924-89AE-7F0120CE08BD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatchingGame.Logic", "MatchingGame.Logic\MatchingGame.Logic.csproj", "{36B3E6E2-A9AE-4924-89AE-7F0120CE08BD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/windowsforms/matching-game/net-windows/cs/MatchingGame/App.config b/windowsforms/matching-game/net-windows/cs/MatchingGame/App.config
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <configSections>
+    </configSections>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+    </startup>
+
+</configuration>
diff --git a/...dows/cs/MatchingGame/MainForm.Designer.cs → ...dows/cs/MatchingGame/MainForm.Designer.cs b/...dows/cs/MatchingGame/MainForm.Designer.cs → ...dows/cs/MatchingGame/MainForm.Designer.cs
diff --git a/.../net8-windows/cs/MatchingGame/MainForm.cs → ...e/net-windows/cs/MatchingGame/MainForm.cs b/.../net8-windows/cs/MatchingGame/MainForm.cs → ...e/net-windows/cs/MatchingGame/MainForm.cs
diff --git a/...et8-windows/cs/MatchingGame/MainForm.resx → ...net-windows/cs/MatchingGame/MainForm.resx b/...et8-windows/cs/MatchingGame/MainForm.resx → ...net-windows/cs/MatchingGame/MainForm.resx
diff --git a/...ndows/cs/MatchingGame/MatchingGame.csproj → ...ndows/cs/MatchingGame/MatchingGame.csproj b/...ndows/cs/MatchingGame/MatchingGame.csproj → ...ndows/cs/MatchingGame/MatchingGame.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>

diff --git a/...e/net8-windows/cs/MatchingGame/Program.cs → ...me/net-windows/cs/MatchingGame/Program.cs b/...e/net8-windows/cs/MatchingGame/Program.cs → ...me/net-windows/cs/MatchingGame/Program.cs
diff --git a/...hingGame/Properties/Resources.Designer.cs → ...hingGame/Properties/Resources.Designer.cs b/...hingGame/Properties/Resources.Designer.cs → ...hingGame/Properties/Resources.Designer.cs
diff --git a/...cs/MatchingGame/Properties/Resources.resx → ...cs/MatchingGame/Properties/Resources.resx b/...cs/MatchingGame/Properties/Resources.resx → ...cs/MatchingGame/Properties/Resources.resx
diff --git a/...chingGame/Properties/Settings.Designer.cs → ...chingGame/Properties/Settings.Designer.cs b/...chingGame/Properties/Settings.Designer.cs → ...chingGame/Properties/Settings.Designer.cs
diff --git a/...MatchingGame/Properties/Settings.settings → ...MatchingGame/Properties/Settings.settings b/...MatchingGame/Properties/Settings.settings → ...MatchingGame/Properties/Settings.settings
diff --git a/...s/matching-game/net8-windows/cs/readme.md → ...ms/matching-game/net-windows/cs/readme.md b/...s/matching-game/net8-windows/cs/readme.md → ...ms/matching-game/net-windows/cs/readme.md
@@ -6,7 +6,7 @@ products:
 - dotnet-core
 - windows-forms
 page_type: sample
-name: "Matching Game Sample (.NET 8 C#)"
+name: "Matching Game Sample (.NET 9 C#)"
 urlFragment: "matching-game-net-csharp"
 description: "A simple matching game written for Windows Forms"
 ---
@@ -16,6 +16,6 @@ This sample demonstrates a simple memory game where you try to match tiles in th
 
 ## Prerequisites
 
-- [Visual Studio 2022 version 17.8](https://visualstudio.microsoft.com/downloads/?utm_medium=microsoft&utm_source=learn.microsoft.com&utm_campaign=inline+link&utm_content=download+vs2022+desktopguide+winforms+migration)
+- [Visual Studio 2022 version 17.12](https://visualstudio.microsoft.com/downloads/?utm_medium=microsoft&utm_source=learn.microsoft.com&utm_campaign=inline+link&utm_content=download+vs2022+desktopguide+winforms+migration)
 
   - Enable the [Visual Studio Desktop workload](https://learn.microsoft.com/visualstudio/install/modify-visual-studio?view=vs-2022&preserve-view=true#modify-workloads).
diff --git a/...et8-windows/vb/MatchingGame.Logic/Game.vb → ...net-windows/vb/MatchingGame.Logic/Game.vb b/...et8-windows/vb/MatchingGame.Logic/Game.vb → ...net-windows/vb/MatchingGame.Logic/Game.vb
diff --git a/...ows/vb/MatchingGame.Logic/GameSettings.vb → ...ows/vb/MatchingGame.Logic/GameSettings.vb b/...ows/vb/MatchingGame.Logic/GameSettings.vb → ...ows/vb/MatchingGame.Logic/GameSettings.vb
diff --git a/...chingGame.Logic/MatchingGame.Logic.vbproj → ...chingGame.Logic/MatchingGame.Logic.vbproj b/...chingGame.Logic/MatchingGame.Logic.vbproj → ...chingGame.Logic/MatchingGame.Logic.vbproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <OutputType>Library</OutputType>
-    <MyType>WindowsForms</MyType>
+    <TargetFramework>net9.0-windows</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
+    <OutputType>Library</OutputType>
+    <MyType>Windows</MyType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AssemblyTitle>MatchingGame.Logic</AssemblyTitle>
     <Product>MatchingGame.Logic</Product>

diff --git a/....Logic/My Project/Application.Designer.vb → ....Logic/My Project/Application.Designer.vb b/....Logic/My Project/Application.Designer.vb → ....Logic/My Project/Application.Designer.vb
diff --git a/...ngGame.Logic/My Project/Application.myapp → ...ngGame.Logic/My Project/Application.myapp b/...ngGame.Logic/My Project/Application.myapp → ...ngGame.Logic/My Project/Application.myapp
diff --git a/...hingGame.Logic/My Project/AssemblyInfo.vb → ...hingGame.Logic/My Project/AssemblyInfo.vb b/...hingGame.Logic/My Project/AssemblyInfo.vb → ...hingGame.Logic/My Project/AssemblyInfo.vb
diff --git a/...me.Logic/My Project/Resources.Designer.vb → ...me.Logic/My Project/Resources.Designer.vb b/...me.Logic/My Project/Resources.Designer.vb → ...me.Logic/My Project/Resources.Designer.vb
diff --git a/...chingGame.Logic/My Project/Resources.resx → ...chingGame.Logic/My Project/Resources.resx b/...chingGame.Logic/My Project/Resources.resx → ...chingGame.Logic/My Project/Resources.resx
diff --git a/...ame.Logic/My Project/Settings.Designer.vb → ...ame.Logic/My Project/Settings.Designer.vb b/...ame.Logic/My Project/Settings.Designer.vb → ...ame.Logic/My Project/Settings.Designer.vb
diff --git a/...ngGame.Logic/My Project/Settings.settings → ...ngGame.Logic/My Project/Settings.settings b/...ngGame.Logic/My Project/Settings.settings → ...ngGame.Logic/My Project/Settings.settings
diff --git a/...ing-game/net8-windows/vb/MatchingGame.sln → ...hing-game/net-windows/vb/MatchingGame.sln b/...ing-game/net8-windows/vb/MatchingGame.sln → ...hing-game/net-windows/vb/MatchingGame.sln
diff --git a/windowsforms/matching-game/net-windows/vb/MatchingGame/App.config b/windowsforms/matching-game/net-windows/vb/MatchingGame/App.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+    </startup>
+</configuration>
diff --git a/...dows/vb/MatchingGame/MainForm.Designer.vb → ...dows/vb/MatchingGame/MainForm.Designer.vb b/...dows/vb/MatchingGame/MainForm.Designer.vb → ...dows/vb/MatchingGame/MainForm.Designer.vb
diff --git a/...et8-windows/vb/MatchingGame/MainForm.resx → ...net-windows/vb/MatchingGame/MainForm.resx b/...et8-windows/vb/MatchingGame/MainForm.resx → ...net-windows/vb/MatchingGame/MainForm.resx
diff --git a/.../net8-windows/vb/MatchingGame/MainForm.vb → ...e/net-windows/vb/MatchingGame/MainForm.vb b/.../net8-windows/vb/MatchingGame/MainForm.vb → ...e/net-windows/vb/MatchingGame/MainForm.vb
diff --git a/...ndows/vb/MatchingGame/MatchingGame.vbproj → ...ndows/vb/MatchingGame/MatchingGame.vbproj b/...ndows/vb/MatchingGame/MatchingGame.vbproj → ...ndows/vb/MatchingGame/MatchingGame.vbproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
     <StartupObject>MatchingGame.My.MyApplication</StartupObject>
     <MyType>WindowsForms</MyType>

diff --git a/...ngGame/My Project/Application.Designer.vb → ...ngGame/My Project/Application.Designer.vb b/...ngGame/My Project/Application.Designer.vb → ...ngGame/My Project/Application.Designer.vb
diff --git a/...MatchingGame/My Project/Application.myapp → ...MatchingGame/My Project/Application.myapp b/...MatchingGame/My Project/Application.myapp → ...MatchingGame/My Project/Application.myapp
diff --git a/...b/MatchingGame/My Project/AssemblyInfo.vb → ...b/MatchingGame/My Project/AssemblyInfo.vb b/...b/MatchingGame/My Project/AssemblyInfo.vb → ...b/MatchingGame/My Project/AssemblyInfo.vb
diff --git a/...hingGame/My Project/Resources.Designer.vb → ...hingGame/My Project/Resources.Designer.vb b/...hingGame/My Project/Resources.Designer.vb → ...hingGame/My Project/Resources.Designer.vb
diff --git a/...vb/MatchingGame/My Project/Resources.resx → ...vb/MatchingGame/My Project/Resources.resx b/...vb/MatchingGame/My Project/Resources.resx → ...vb/MatchingGame/My Project/Resources.resx
diff --git a/...chingGame/My Project/Settings.Designer.vb → ...chingGame/My Project/Settings.Designer.vb b/...chingGame/My Project/Settings.Designer.vb → ...chingGame/My Project/Settings.Designer.vb
diff --git a/...MatchingGame/My Project/Settings.settings → ...MatchingGame/My Project/Settings.settings b/...MatchingGame/My Project/Settings.settings → ...MatchingGame/My Project/Settings.settings
diff --git a/...s/matching-game/net8-windows/vb/readme.md → ...ms/matching-game/net-windows/vb/readme.md b/...s/matching-game/net8-windows/vb/readme.md → ...ms/matching-game/net-windows/vb/readme.md
@@ -6,7 +6,7 @@ products:
 - dotnet-core
 - windows-forms
 page_type: sample
-name: "Matching Game Sample (.NET 8 Visual Basic)"
+name: "Matching Game Sample (.NET 9 Visual Basic)"
 urlFragment: "matching-game-net-vb"
 description: "A simple matching game"
 ---
@@ -16,6 +16,6 @@ This sample demonstrates a simple memory game where you try to match tiles in th
 
 ## Prerequisites
 
-- [Visual Studio 2022 version 17.8](https://visualstudio.microsoft.com/downloads/?utm_medium=microsoft&utm_source=learn.microsoft.com&utm_campaign=inline+link&utm_content=download+vs2022+desktopguide+winforms+migration)
+- [Visual Studio 2022 version 17.12](https://visualstudio.microsoft.com/downloads/?utm_medium=microsoft&utm_source=learn.microsoft.com&utm_campaign=inline+link&utm_content=download+vs2022+desktopguide+winforms+migration)
 
   - Enable the [Visual Studio Desktop workload](https://learn.microsoft.com/visualstudio/install/modify-visual-studio?view=vs-2022&preserve-view=true#modify-workloads).
diff --git a/windowsforms/matching-game/net45/cs/snippets.5000.json b/windowsforms/matching-game/net45/cs/snippets.5000.json
diff --git a/windowsforms/matching-game/net45/vb/snippets.5000.json b/windowsforms/matching-game/net45/vb/snippets.5000.json
diff --git a/windowsforms/matching-game/readme.md b/windowsforms/matching-game/readme.md
@@ -1,8 +1,8 @@
 # Matching Game Sample
 
-These two samples are used by the [.NET Upgrade Assistant](https://docs.microsoft.com/dotnet/core/porting/upgrade-assistant-wpf-framework) article.
+These two samples are used by the [.NET Upgrade Assistant](https://docs.microsoft.com/dotnet/core/porting/upgrade-assistant-winforms-framework) article.
 
 - The .NET Framework version of the app is available in the *net45* folder.
-- The .NET 5 version of the app is available in the *net5-windows* folder.
+- The .NET version of the app is available in the *net#-windows* folder.
 
 ![Screenshot](images/screenshot.png)