From fbf36fc7dc75ccb13047fea71f050eaf0ddd19eb Mon Sep 17 00:00:00 2001
From: bezo97 <bezozo97@gmail.com>
Date: Sun, 14 Nov 2021 17:11:18 +0100
Subject: [PATCH] prepare nuget packages, setup project - update deprecated
 license expressions - include symbols package - update publish profiles -
 show version in installer

---
 .../IFSEngine.WPF.InteractiveDisplay.csproj   | 86 ++++++++++---------
 IFSEngine/IFSEngine.csproj                    | 82 +++++++++---------
 Setup/Setup.vdproj                            | 18 ++--
 .../PublishProfiles/PublishInstaller.pubxml   |  5 +-
 .../PublishProfiles/PublishPortable.pubxml    |  2 +-
 WpfDisplay/WpfDisplay.csproj                  |  6 +-
 6 files changed, 100 insertions(+), 99 deletions(-)

diff --git a/IFSEngine.WPF.InteractiveDisplay/IFSEngine.WPF.InteractiveDisplay.csproj b/IFSEngine.WPF.InteractiveDisplay/IFSEngine.WPF.InteractiveDisplay.csproj
index 471803b..7e2cc12 100644
--- a/IFSEngine.WPF.InteractiveDisplay/IFSEngine.WPF.InteractiveDisplay.csproj
+++ b/IFSEngine.WPF.InteractiveDisplay/IFSEngine.WPF.InteractiveDisplay.csproj
@@ -1,50 +1,52 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
-    <UseWPF>true</UseWPF>
-    <UseWindowsForms>true</UseWindowsForms>
-    <Version>1.0.0-pre.3</Version>
-    <PackageLicenseExpression>GPL-3.0</PackageLicenseExpression>
-    <Authors>bezo97</Authors>
-    <Company>bezo97</Company>
-    <Description>WPF UIElement for IFSEngine, a 3D IFS fractal rendering engine.</Description>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
-    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageIcon>icon_128.png</PackageIcon>
-    <PackageProjectUrl>https://github.com/bezo97/IFSRenderer</PackageProjectUrl>
-    <Copyright>Copyright (C) 2021 Dócs Zoltán &amp; Contributors</Copyright>
-    <RepositoryUrl>https://github.com/bezo97/IFSRenderer</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <PackageTags>fractal;3d;graphics;art;ifs;rendering;interactive</PackageTags>
-    <PackageReleaseNotes>https://github.com/bezo97/IFSRenderer/releases</PackageReleaseNotes>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net6.0-windows</TargetFramework>
+		<UseWPF>true</UseWPF>
+		<UseWindowsForms>true</UseWindowsForms>
+		<Version>1.0.0-pre.3</Version>
+		<PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
+		<Authors>bezo97</Authors>
+		<Company>bezo97</Company>
+		<Description>WPF UIElement for IFSEngine, a 3D IFS fractal rendering engine.</Description>
+		<PackageReadmeFile>README.md</PackageReadmeFile>
+		<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+		<PackageIcon>icon_128.png</PackageIcon>
+		<PackageProjectUrl>https://github.com/bezo97/IFSRenderer</PackageProjectUrl>
+		<Copyright>Copyright (C) 2021 Dócs Zoltán &amp; Contributors</Copyright>
+		<RepositoryUrl>https://github.com/bezo97/IFSRenderer</RepositoryUrl>
+		<RepositoryType>git</RepositoryType>
+		<IncludeSymbols>true</IncludeSymbols>
+		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
+		<PackageTags>fractal;3d;graphics;art;ifs;rendering;interactive</PackageTags>
+		<PackageReleaseNotes>https://github.com/bezo97/IFSRenderer/releases</PackageReleaseNotes>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="OpenTK.Windowing.Common" Version="4.6.4" />
-    <PackageReference Include="OpenTK.WinForms" Version="4.0.0-pre.6" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="OpenTK.Windowing.Common" Version="4.6.4" />
+		<PackageReference Include="OpenTK.WinForms" Version="4.0.0-pre.6" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\IFSEngine\IFSEngine.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\IFSEngine\IFSEngine.csproj" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Page Update="InteractiveDisplay.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-    </Page>
-  </ItemGroup>
+	<ItemGroup>
+		<Page Update="InteractiveDisplay.xaml">
+			<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+		</Page>
+	</ItemGroup>
 
-  <ItemGroup>
-    <None Include="..\Assets\icon_128.png">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-      <Visible>False</Visible>
-    </None>
-    <None Include="README.md">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
-  </ItemGroup>
+	<ItemGroup>
+		<None Include="..\Assets\icon_128.png">
+			<Pack>True</Pack>
+			<PackagePath></PackagePath>
+			<Visible>False</Visible>
+		</None>
+		<None Include="README.md">
+			<Pack>True</Pack>
+			<PackagePath></PackagePath>
+		</None>
+	</ItemGroup>
 
 </Project>
diff --git a/IFSEngine/IFSEngine.csproj b/IFSEngine/IFSEngine.csproj
index 0a91ba0..7429e10 100644
--- a/IFSEngine/IFSEngine.csproj
+++ b/IFSEngine/IFSEngine.csproj
@@ -1,47 +1,49 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <RootNamespace>IFSEngine</RootNamespace>
-    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <Authors>bezo97</Authors>
-    <Description>3D IFS fractal rendering engine.</Description>
-    <Copyright>Copyright (C) 2021 Dócs Zoltán &amp; Contributors</Copyright>
-    <Version>1.0.0-pre.4</Version>
-    <PackageLicenseExpression>GPL-3.0</PackageLicenseExpression>
-    <PackageProjectUrl>https://github.com/bezo97/IFSRenderer</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/bezo97/IFSRenderer</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <PackageTags>fractal;3d;graphics;art;ifs;rendering</PackageTags>
-    <PackageReleaseNotes>https://github.com/bezo97/IFSRenderer/releases</PackageReleaseNotes>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
-    <PackageIcon>icon_128.png</PackageIcon>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net6.0</TargetFramework>
+		<RootNamespace>IFSEngine</RootNamespace>
+		<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+		<Authors>bezo97</Authors>
+		<Description>3D IFS fractal rendering engine.</Description>
+		<Copyright>Copyright (C) 2021 Dócs Zoltán &amp; Contributors</Copyright>
+		<Version>1.0.0-pre.4</Version>
+		<PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
+		<PackageProjectUrl>https://github.com/bezo97/IFSRenderer</PackageProjectUrl>
+		<RepositoryUrl>https://github.com/bezo97/IFSRenderer</RepositoryUrl>
+		<RepositoryType>git</RepositoryType>
+		<IncludeSymbols>true</IncludeSymbols>
+		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
+		<PackageTags>fractal;3d;graphics;art;ifs;rendering</PackageTags>
+		<PackageReleaseNotes>https://github.com/bezo97/IFSRenderer/releases</PackageReleaseNotes>
+		<PackageReadmeFile>README.md</PackageReadmeFile>
+		<PackageIcon>icon_128.png</PackageIcon>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="Rendering\Shaders\de.frag.shader" />
-    <EmbeddedResource Include="Rendering\Shaders\tonemap.frag.shader" />
-    <EmbeddedResource Include="Rendering\Shaders\quad.vert.shader" />
-    <EmbeddedResource Include="Rendering\Shaders\ifs_kernel.comp.shader" />
-    <EmbeddedResource Include="Rendering\Shaders\taa.frag.shader" />
-  </ItemGroup>
+	<ItemGroup>
+		<EmbeddedResource Include="Rendering\Shaders\de.frag.shader" />
+		<EmbeddedResource Include="Rendering\Shaders\tonemap.frag.shader" />
+		<EmbeddedResource Include="Rendering\Shaders\quad.vert.shader" />
+		<EmbeddedResource Include="Rendering\Shaders\ifs_kernel.comp.shader" />
+		<EmbeddedResource Include="Rendering\Shaders\taa.frag.shader" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="OpenTK.Graphics" Version="4.6.4" />
-    <PackageReference Include="OpenTK.Windowing.Common" Version="4.6.4" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+		<PackageReference Include="OpenTK.Graphics" Version="4.6.4" />
+		<PackageReference Include="OpenTK.Windowing.Common" Version="4.6.4" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <None Include="..\Assets\icon_128.png">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-      <Visible>False</Visible>
-    </None>
-    <None Include="README.md">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
-  </ItemGroup>
+	<ItemGroup>
+		<None Include="..\Assets\icon_128.png">
+			<Pack>True</Pack>
+			<PackagePath></PackagePath>
+			<Visible>False</Visible>
+		</None>
+		<None Include="README.md">
+			<Pack>True</Pack>
+			<PackagePath></PackagePath>
+		</None>
+	</ItemGroup>
 
 </Project>
diff --git a/Setup/Setup.vdproj b/Setup/Setup.vdproj
index 0e82f7b..e5e9596 100644
--- a/Setup/Setup.vdproj
+++ b/Setup/Setup.vdproj
@@ -318,7 +318,7 @@
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:IFSRenderer"
         "ProductCode" = "8:{5C9949AC-416D-477C-8DD0-4EC4B132E64A}"
-        "PackageCode" = "8:{EBB444EC-241A-447F-A012-09EF675ABE44}"
+        "PackageCode" = "8:{869EADCF-A928-44D6-AF45-936FD33791C4}"
         "UpgradeCode" = "8:{4E458E2D-D700-48A5-954C-3D6975C54AA6}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
@@ -335,7 +335,7 @@
         "Keywords" = "8:fractal, 3d, graphics, art, ifs, rendering, editor"
         "ARPCOMMENTS" = "8:3D IFS fractal editor"
         "ARPURLINFOABOUT" = "8:https://github.com/bezo97/IFSRenderer"
-        "ARPPRODUCTICON" = "8:"
+        "ARPPRODUCTICON" = "8:_F0943708ABF748BAB90D4F615173D8CC"
         "ARPIconIndex" = "3:32512"
         "SearchPath" = "8:"
         "UseSystemSearchPath" = "11:TRUE"
@@ -565,8 +565,8 @@
                             "Type" = "3:3"
                             "ContextData" = "8:"
                             "Attributes" = "3:0"
-                            "Setting" = "3:1"
-                            "Value" = "8:#1202"
+                            "Setting" = "3:2"
+                            "Value" = "8:This installer does not include the source code. It is available in the project repository: https://github.com/bezo97/IFSRenderer"
                             "DefaultValue" = "8:#1202"
                             "UsePlugInResources" = "11:TRUE"
                             }
@@ -578,8 +578,8 @@
                             "Type" = "3:3"
                             "ContextData" = "8:"
                             "Attributes" = "3:0"
-                            "Setting" = "3:1"
-                            "Value" = "8:#1203"
+                            "Setting" = "3:2"
+                            "Value" = "8:The installer will guide you through the steps required to install IFSRenderer v[ProductVersion] on your computer."
                             "DefaultValue" = "8:#1203"
                             "UsePlugInResources" = "11:TRUE"
                             }
@@ -704,8 +704,8 @@
                             "Type" = "3:3"
                             "ContextData" = "8:"
                             "Attributes" = "3:0"
-                            "Setting" = "3:1"
-                            "Value" = "8:#1203"
+                            "Setting" = "3:2"
+                            "Value" = "8:The installer will guide you through the steps required to install IFSRenderer v[ProductVersion] on your computer."
                             "DefaultValue" = "8:#1203"
                             "UsePlugInResources" = "11:TRUE"
                             }
@@ -902,7 +902,7 @@
                             "ContextData" = "8:"
                             "Attributes" = "3:0"
                             "Setting" = "3:2"
-                            "Value" = "8:Installation finished."
+                            "Value" = "8:Installation of IFSRenderer v[ProductVersion] finished."
                             "DefaultValue" = "8:#1258"
                             "UsePlugInResources" = "11:TRUE"
                             }
diff --git a/WpfDisplay/Properties/PublishProfiles/PublishInstaller.pubxml b/WpfDisplay/Properties/PublishProfiles/PublishInstaller.pubxml
index f99995e..e42a3d5 100644
--- a/WpfDisplay/Properties/PublishProfiles/PublishInstaller.pubxml
+++ b/WpfDisplay/Properties/PublishProfiles/PublishInstaller.pubxml
@@ -8,10 +8,11 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>bin\Publish\Installer\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <SelfContained>false</SelfContained>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <PublishSingleFile>True</PublishSingleFile>
+    <PublishSingleFile>False</PublishSingleFile>
     <PublishReadyToRun>False</PublishReadyToRun>
+    <PublishTrimmed>False</PublishTrimmed>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/WpfDisplay/Properties/PublishProfiles/PublishPortable.pubxml b/WpfDisplay/Properties/PublishProfiles/PublishPortable.pubxml
index aa6f833..f1860ea 100644
--- a/WpfDisplay/Properties/PublishProfiles/PublishPortable.pubxml
+++ b/WpfDisplay/Properties/PublishProfiles/PublishPortable.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>bin\Publish\Portable\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <SelfContained>true</SelfContained>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <PublishSingleFile>True</PublishSingleFile>
diff --git a/WpfDisplay/WpfDisplay.csproj b/WpfDisplay/WpfDisplay.csproj
index 54c382e..8051d19 100644
--- a/WpfDisplay/WpfDisplay.csproj
+++ b/WpfDisplay/WpfDisplay.csproj
@@ -12,20 +12,16 @@
 		<Win32Resource />
 		<Configurations>Debug;ReleasePortable;ReleaseInstaller</Configurations>
 		<Version>1.0.0-pre.1</Version>
-		<PackageLicenseExpression>GPL-3.0</PackageLicenseExpression>
+		<PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleasePortable|AnyCPU'">
 		<DefineConstants>TRACE;PORTABLE</DefineConstants>
-		<DebugType>none</DebugType>
-		<DebugSymbols>false</DebugSymbols>
 		<Optimize>True</Optimize>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseInstaller|AnyCPU'">
 		<DefineConstants>TRACE;INSTALLER</DefineConstants>
-		<DebugType>none</DebugType>
-		<DebugSymbols>false</DebugSymbols>
 		<Optimize>True</Optimize>
 	</PropertyGroup>