II 2.0.2 Release: .NET 6.0

- II Avalonia now targeting .NET 6.0 - II Dev Tools Publishing Utility building from .NET 6.0 packages
tanjera · May 12, 2022 · c11d471 · c11d471
1 parent 5ad2ec6
commit c11d471
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/II Avalonia/II Avalonia.csproj b/II Avalonia/II Avalonia.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <StartupObject>II_Avalonia.Program</StartupObject>
     <SignAssembly>false</SignAssembly>
     <AssemblyName>Infirmary Integrated</AssemblyName>
-    <Copyright>© 2017-2021, Ibi Keller</Copyright>
+    <Copyright>© 2017-2022, Ibi Keller</Copyright>
     <Authors>Ibi Keller</Authors>
-    <Version>2.0.1</Version>
+    <Version>2.0.2</Version>
     <Company>Infirmary Integrated</Company>
     <PackageLicenseFile>License.md</PackageLicenseFile>
     <PackageProjectUrl>https://www.infirmary-integrated.com/</PackageProjectUrl>

diff --git a/II Development Tools/Publishing Utility/Building.cs b/II Development Tools/Publishing Utility/Building.cs
@@ -87,7 +87,7 @@ public static void Pack (Program.Variables progVar, string dirBin, string dirRel
             Process proc = new Process ();
             string arguments = "";
 
-            string dirBuild = Path.Combine (new string[] { dirBin, "Release", "net5.0", release });
+            string dirBuild = Path.Combine (new string[] { dirBin, "Release", progVar.versionDotnet, release });
             string dirPublish = Path.Combine (dirBuild, "publish");
             string dirII = Path.Combine (dirBuild, "Infirmary Integrated");
 

diff --git a/II Development Tools/Publishing Utility/Program.cs b/II Development Tools/Publishing Utility/Program.cs
@@ -8,13 +8,16 @@ public class Program {
         // Parameters to be set for runtime environment
 
         public class Variables {
+            public string versionDotnet;
             public string pathDotnet;
             public string pathTar;
             public string pathSigntool;
             public string pathCert;
             public string dirSolution;
 
             public Variables() {
+                versionDotnet = "net6.0";
+
                 if (OperatingSystem.IsWindows()) {
                     pathDotnet = @"C:\Program Files\dotnet\dotnet.exe";
                     pathTar = @"C:\Windows\System32\tar.exe";

diff --git a/II Development Tools/Publishing Utility/Publishing Utility.csproj b/II Development Tools/Publishing Utility/Publishing Utility.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Publishing</RootNamespace>
     <StartupObject>Publishing.Program</StartupObject>
     <AssemblyName>Publishing Utility</AssemblyName>