Merge pull request #613 from NetSparkleUpdater/feature/consolidate-wi…

…nforms-ui Merge WinForms UI projects into one
NetSparkleUpdater · Aug 19, 2024 · efab052 · efab052
2 parents a559cac + 67f3e31
commit efab052
Show file tree

Hide file tree

Showing 91 changed files with 49 additions and 12,109 deletions.
diff --git a/.github/workflows/publish-nuget.yml b/.github/workflows/publish-nuget.yml
@@ -78,17 +78,16 @@ jobs:
       - name: Clean things to be safe
         run: |
           dotnet clean ${{ github.workspace }}/src/NetSparkle/NetSparkle.csproj --configuration Release
-          dotnet clean ${{ github.workspace }}/src/NetSparkle.UI.WinForms.NetCore/NetSparkle.UI.WinForms.NetCore.csproj --configuration Release
+          dotnet clean ${{ github.workspace }}/src/NetSparkle.UI.WinForms/NetSparkle.UI.WinForms.csproj --configuration Release
           dotnet clean ${{ github.workspace }}/src/NetSparkle.UI.WPF/NetSparkle.UI.WPF.csproj --configuration Release
           dotnet clean ${{ github.workspace }}/src/NetSparkle.Tools.AppCastGenerator/NetSparkle.Tools.AppCastGenerator.csproj --configuration Release
           dotnet clean ${{ github.workspace }}/src/NetSparkle.Tools.DSAHelper/NetSparkle.Tools.DSAHelper.csproj --configuration Release
-          msbuild ${{ github.workspace }}/src/NetSparkle.UI.WinForms.NetFramework/NetSparkle.UI.WinForms.NetFramework.csproj /property:Configuration=Release /t:Clean /p:OutputPath=../../nuget/winformsnetframework/lib/net462
 
       - name: Build NetSparkle in Release
         run: dotnet build ${{ github.workspace }}/src/NetSparkle/NetSparkle.csproj --configuration Release
 
-      - name: Build NetSparkle.UI.WinForms.NetCore in Release
-        run: dotnet build ${{ github.workspace }}/src/NetSparkle.UI.WinForms.NetCore/NetSparkle.UI.WinForms.NetCore.csproj --configuration Release
+      - name: Build NetSparkle.UI.WinForms in Release
+        run: dotnet build ${{ github.workspace }}/src/NetSparkle.UI.WinForms/NetSparkle.UI.WinForms.csproj --configuration Release
 
       - name: Build NetSparkle.UI.WPF in Release
         run: dotnet build ${{ github.workspace }}/src/NetSparkle.UI.WPF/NetSparkle.UI.WPF.csproj --configuration Release
@@ -98,12 +97,7 @@ jobs:
 
       - name: Build NetSparkle.Tools.DSAHelper in Release
         run: dotnet build ${{ github.workspace }}/src/NetSparkle.Tools.DSAHelper/NetSparkle.Tools.DSAHelper.csproj --configuration Release
-
-      - name: Build NetSparkle.UI.WinForms.NetFramework in Release
-        run: |
-          msbuild ${{ github.workspace }}/src/NetSparkle.UI.WinForms.NetFramework/NetSparkle.UI.WinForms.NetFramework.csproj /property:Configuration=Release /t:Restore /p:OutputPath=../../nuget/winformsnetframework/lib/net462 /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg
-          msbuild ${{ github.workspace }}/src/NetSparkle.UI.WinForms.NetFramework/NetSparkle.UI.WinForms.NetFramework.csproj /property:Configuration=Release /p:OutputPath=../../nuget/winformsnetframework/lib/net462 /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg
-
+
   publish:
     name: Build and publish all packages to NuGet
     runs-on: windows-latest
@@ -163,10 +157,10 @@ jobs:
           PACKAGE_NAME: NetSparkleUpdater.UI.Avalonia
           INCLUDE_SYMBOLS: true
 
-      - name: Publish NetSparkleUpdater.UI.WinForms.NetCore on version change
+      - name: Publish NetSparkleUpdater.UI.WinForms (NetCore) on version change
         uses: nitz/publish-nuget@60fd3adf9d9eecc3bbf8a98738734d3061347172
         with:
-          PROJECT_FILE_PATH: ${{ github.workspace }}/src/NetSparkle.UI.WinForms.NetCore/NetSparkle.UI.WinForms.NetCore.csproj # Relative to repository root
+          PROJECT_FILE_PATH: ${{ github.workspace }}/src/NetSparkle.UI.WinForms/NetSparkle.UI.WinForms.csproj # Relative to repository root
           # VERSION_FILE_PATH: Directory.Build.props # Filepath with version info, relative to repository root. Defaults to project file
           # VERSION_REGEX: <Version>(.*)<\/Version> # Regex pattern to extract version info in a capturing group
           TAG_COMMIT: false # Flag to enable / disalge git tagging
@@ -175,25 +169,17 @@ jobs:
           PACKAGE_NAME: NetSparkleUpdater.UI.WinForms.NetCore
           INCLUDE_SYMBOLS: true
 
-      - name: Build NetSparkle.UI.WinForms.NetFramework in Release
-        run: |
-          msbuild ${{ github.workspace }}/src/NetSparkle.UI.WinForms.NetFramework/NetSparkle.UI.WinForms.NetFramework.csproj /property:Configuration=Release /t:Restore /p:OutputPath=../../nuget/winformsnetframework/lib/net462 /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg
-          msbuild ${{ github.workspace }}/src/NetSparkle.UI.WinForms.NetFramework/NetSparkle.UI.WinForms.NetFramework.csproj /property:Configuration=Release /p:OutputPath=../../nuget/winformsnetframework/lib/net462 /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg
-
-      - name: Setup NetSparkleUpdater.UI.WinForms.NetFramework folder
-        run: |
-          del ${{ github.workspace }}/nuget\winformsnetframework\lib\net462\NetSparkle.dll
-          del ${{ github.workspace }}/nuget\winformsnetframework\lib\net462\NetSparkle.pdb
-          copy ${{ github.workspace }}/LICENSE.md ${{ github.workspace }}/nuget\winformsnetframework\LICENSE.md
-          copy ${{ github.workspace }}/README.md ${{ github.workspace }}/nuget\winformsnetframework\README.md
-          copy ${{ github.workspace }}/src\NetSparkle\ArtWork\software-update-available.png ${{ github.workspace }}/nuget\winformsnetframework\software-update-available.png
-          
-      - name: Publish NetSparkleUpdater.UI.WinForms.NetFramework
-        run: |
-          cd ${{ github.workspace }}/nuget/winformsnetframework
-          nuget pack NetSparkleUpdater.UI.WinForms.NetFramework.nuspec -verbosity detailed -Symbols -SymbolPackageFormat snupkg
-          nuget push *.nupkg -Source https://www.nuget.org/api/v2/package -SkipDuplicate -verbosity detailed
-          cd ${{ github.workspace }}
+      - name: Publish NetSparkleUpdater.UI.WinForms.NetFramework on version change
+        uses: nitz/publish-nuget@60fd3adf9d9eecc3bbf8a98738734d3061347172
+        with:
+          PROJECT_FILE_PATH: ${{ github.workspace }}/src/NetSparkle.UI.WinForms/NetSparkle.UI.WinForms.csproj # Relative to repository root
+          # VERSION_FILE_PATH: Directory.Build.props # Filepath with version info, relative to repository root. Defaults to project file
+          # VERSION_REGEX: <Version>(.*)<\/Version> # Regex pattern to extract version info in a capturing group
+          TAG_COMMIT: false # Flag to enable / disalge git tagging
+          # TAG_FORMAT: v* # Format of the git tag, [*] gets replaced with version
+          NUGET_KEY: ${{secrets.NUGET_API_KEY}} # nuget.org API key
+          PACKAGE_NAME: NetSparkleUpdater.UI.WinForms.NetFramework
+          INCLUDE_SYMBOLS: true
 
       - name: Publish NetSparkleUpdater.Tools.DSAHelper
         uses: nitz/publish-nuget@60fd3adf9d9eecc3bbf8a98738734d3061347172

diff --git a/NetSparkleUpdater.sln b/NetSparkleUpdater.sln
@@ -20,16 +20,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetSparkle.Tests", "src\Net
 		{74635A21-2BAD-4522-AB95-E3E5703CD301} = {74635A21-2BAD-4522-AB95-E3E5703CD301}
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetSparkle.UI.WinForms.NetCore", "src\NetSparkle.UI.WinForms.NetCore\NetSparkle.UI.WinForms.NetCore.csproj", "{45F5AADB-A39B-446F-8025-71647238BB89}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetSparkle.UI.WinForms", "src\NetSparkle.UI.WinForms\NetSparkle.UI.WinForms.csproj", "{45F5AADB-A39B-446F-8025-71647238BB89}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetSparkle.UI.WPF", "src\NetSparkle.UI.WPF\NetSparkle.UI.WPF.csproj", "{6915843C-7947-4268-B569-6F5684651DF4}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetSparkle.Samples.NetCore.WPF", "src\NetSparkle.Samples.NetCore.WPF\NetSparkle.Samples.NetCore.WPF.csproj", "{4DD4076B-C086-4A11-B850-898CC9991D90}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetSparkle.Samples.NetCore.WinForms", "src\NetSparkle.Samples.NetCore.WinForms\NetSparkle.Samples.NetCore.WinForms.csproj", "{0088BDC7-D50B-4AD4-8EE6-D2B7DA150778}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetSparkle.UI.WinForms.NetFramework", "src\NetSparkle.UI.WinForms.NetFramework\NetSparkle.UI.WinForms.NetFramework.csproj", "{DAB16394-9862-49C3-818B-6B84F22EF5FE}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetSparkle.UI.Avalonia", "src\NetSparkle.UI.Avalonia\NetSparkle.UI.Avalonia.csproj", "{A50C27FA-CE8E-4253-BC1E-4B60053B0B7E}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetSparkle.Samples.Avalonia", "src\NetSparkle.Samples.Avalonia\NetSparkle.Samples.Avalonia.csproj", "{1DBD011C-C437-4126-9F12-A9D0BDEA3AA2}"
@@ -43,7 +41,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F3EF1CB9-F6D1-4D71-87C2-F2E80DD53968}"
 	ProjectSection(SolutionItems) = preProject
 		Directory.Build.props = Directory.Build.props
-		nuget\winformsnetframework\NetSparkleUpdater.UI.WinForms.NetFramework.nuspec = nuget\winformsnetframework\NetSparkleUpdater.UI.WinForms.NetFramework.nuspec
 		.github\workflows\publish-nuget.yml = .github\workflows\publish-nuget.yml
 		README.md = README.md
 	EndProjectSection
@@ -52,7 +49,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetSparkle.Samples.Avalonia
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetSparkle.Tests.Trimming", "src\NetSparkle.Tests.Trimming\NetSparkle.Tests.Trimming.csproj", "{7AE76C89-60B5-4F0E-A774-6E52F53B59D5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetSparkle.Samples.Forms.Multithread", "src\NetSparkle.Samples.Forms.Multithread\NetSparkle.Samples.Forms.Multithread.csproj", "{7952F006-5B13-45CF-93A8-46A0A470575F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetSparkle.Samples.Forms.Multithread", "src\NetSparkle.Samples.Forms.Multithread\NetSparkle.Samples.Forms.Multithread.csproj", "{7952F006-5B13-45CF-93A8-46A0A470575F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -280,26 +277,6 @@ Global
 		{0088BDC7-D50B-4AD4-8EE6-D2B7DA150778}.Release|x64.Build.0 = Release|Any CPU
 		{0088BDC7-D50B-4AD4-8EE6-D2B7DA150778}.Release|x86.ActiveCfg = Release|Any CPU
 		{0088BDC7-D50B-4AD4-8EE6-D2B7DA150778}.Release|x86.Build.0 = Release|Any CPU
-		{DAB16394-9862-49C3-818B-6B84F22EF5FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DAB16394-9862-49C3-818B-6B84F22EF5FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DAB16394-9862-49C3-818B-6B84F22EF5FE}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{DAB16394-9862-49C3-818B-6B84F22EF5FE}.Debug|ARM.Build.0 = Debug|Any CPU
-		{DAB16394-9862-49C3-818B-6B84F22EF5FE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DAB16394-9862-49C3-818B-6B84F22EF5FE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DAB16394-9862-49C3-818B-6B84F22EF5FE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DAB16394-9862-49C3-818B-6B84F22EF5FE}.Debug|x64.Build.0 = Debug|Any CPU
-		{DAB16394-9862-49C3-818B-6B84F22EF5FE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DAB16394-9862-49C3-818B-6B84F22EF5FE}.Debug|x86.Build.0 = Debug|Any CPU
-		{DAB16394-9862-49C3-818B-6B84F22EF5FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DAB16394-9862-49C3-818B-6B84F22EF5FE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DAB16394-9862-49C3-818B-6B84F22EF5FE}.Release|ARM.ActiveCfg = Release|Any CPU
-		{DAB16394-9862-49C3-818B-6B84F22EF5FE}.Release|ARM.Build.0 = Release|Any CPU
-		{DAB16394-9862-49C3-818B-6B84F22EF5FE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{DAB16394-9862-49C3-818B-6B84F22EF5FE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{DAB16394-9862-49C3-818B-6B84F22EF5FE}.Release|x64.ActiveCfg = Release|Any CPU
-		{DAB16394-9862-49C3-818B-6B84F22EF5FE}.Release|x64.Build.0 = Release|Any CPU
-		{DAB16394-9862-49C3-818B-6B84F22EF5FE}.Release|x86.ActiveCfg = Release|Any CPU
-		{DAB16394-9862-49C3-818B-6B84F22EF5FE}.Release|x86.Build.0 = Release|Any CPU
 		{A50C27FA-CE8E-4253-BC1E-4B60053B0B7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A50C27FA-CE8E-4253-BC1E-4B60053B0B7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A50C27FA-CE8E-4253-BC1E-4B60053B0B7E}.Debug|ARM.ActiveCfg = Debug|Any CPU

diff --git a/src/NetSparkle.Samples.Forms.Multithread/NetSparkle.Samples.Forms.Multithread.csproj b/src/NetSparkle.Samples.Forms.Multithread/NetSparkle.Samples.Forms.Multithread.csproj
@@ -9,7 +9,7 @@
 	<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\NetSparkle.UI.WinForms.NetCore\NetSparkle.UI.WinForms.NetCore.csproj" />
+    <ProjectReference Include="..\NetSparkle.UI.WinForms\NetSparkle.UI.WinForms.csproj" />
     <ProjectReference Include="..\NetSparkle\NetSparkle.csproj" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/NetSparkle.Samples.HandleEventsYourself/NetSparkle.Samples.HandleEventsYourself.csproj b/src/NetSparkle.Samples.HandleEventsYourself/NetSparkle.Samples.HandleEventsYourself.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows'">
-    <PackageReference Include="System.Drawing.Common" Version="8.0.7" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NetSparkle.Samples.NetCore.WinForms/NetSparkle.Samples.NetCore.WinForms.csproj b/src/NetSparkle.Samples.NetCore.WinForms/NetSparkle.Samples.NetCore.WinForms.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
@@ -22,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\NetSparkle.UI.WinForms.NetCore\NetSparkle.UI.WinForms.NetCore.csproj" />
+    <ProjectReference Include="..\NetSparkle.UI.WinForms\NetSparkle.UI.WinForms.csproj" />
     <ProjectReference Include="..\NetSparkle\NetSparkle.csproj" />
   </ItemGroup>
 

diff --git a/src/NetSparkle.Samples.NetFramework.WinForms/NetSparkle.Samples.NetFramework.WinForms.csproj b/src/NetSparkle.Samples.NetFramework.WinForms/NetSparkle.Samples.NetFramework.WinForms.csproj
@@ -109,9 +109,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\NetSparkle.UI.WinForms.NetFramework\NetSparkle.UI.WinForms.NetFramework.csproj">
-      <Project>{dab16394-9862-49c3-818b-6b84f22ef5fe}</Project>
-      <Name>NetSparkle.UI.WinForms.NetFramework</Name>
+    <ProjectReference Include="..\NetSparkle.UI.WinForms\NetSparkle.UI.WinForms.csproj">
+      <Project>{45f5aadb-a39b-446f-8025-71647238bb89}</Project>
+      <Name>NetSparkle.UI.WinForms</Name>
     </ProjectReference>
     <ProjectReference Include="..\NetSparkle\NetSparkle.csproj">
       <Project>{74635A21-2BAD-4522-AB95-E3E5703CD301}</Project>

diff --git a/src/NetSparkle.UI.WPF/NetSparkle.UI.WPF.csproj b/src/NetSparkle.UI.WPF/NetSparkle.UI.WPF.csproj
@@ -52,13 +52,13 @@
     <ProjectReference Include="..\NetSparkle\NetSparkle.csproj" />
   </ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0-windows'">
-		<PackageReference Include="System.Drawing.Common" Version="8.0.7" />
+		<PackageReference Include="System.Drawing.Common" Version="8.0.8" />
 	</ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0-windows'">
-		<PackageReference Include="System.Drawing.Common" Version="8.0.7" />
+		<PackageReference Include="System.Drawing.Common" Version="8.0.8" />
 	</ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows'">
-		<PackageReference Include="System.Drawing.Common" Version="8.0.7" />
+		<PackageReference Include="System.Drawing.Common" Version="8.0.8" />
 	</ItemGroup>
   <ItemGroup>
     <None Include="..\..\LICENSE.md" Pack="true" PackagePath="\" />

diff --git a/src/NetSparkle.UI.WinForms.NetFramework/CheckingForUpdatesWindow.Designer.cs b/src/NetSparkle.UI.WinForms.NetFramework/CheckingForUpdatesWindow.Designer.cs