Fixed code that broke the .NET Framework build.

Author: SteveIves

CodeGenEngine/CodeGenerator.dbl

@@ -110,7 +110,9 @@ namespace CodeGen.Engine
             ;;Is CODEGEN_TPLDIR set in the environment?
             data templateFolder = Environment.GetEnvironmentVariable("CODEGEN_TPLDIR")
 
-            if (OperatingSystem.IsWindows() && String.IsNullOrWhiteSpace(templateFolder))
+.ifdef OS_WINDOWNSET
+
+            if (String.IsNullOrWhiteSpace(templateFolder))
             begin
                 ;;No, look in the registry for the value set by InstallShield
                 templateFolder = (String)Registry.GetValue("HKEY_LOCAL_MACHINE\SOFTWARE\Synergex\CodeGen","TemplatePath","")
@@ -130,17 +132,19 @@ namespace CodeGen.Engine
                     end
                 end
             end
-
+.endc
             ;;Is CODEGEN_AUTHOR already set in the environment?
             data authorName = Environment.GetEnvironmentVariable("CODEGEN_AUTHOR")
 
-            if (!String.IsNullOrWhiteSpace(authorName)) then
+            if (!String.IsNullOrWhiteSpace(authorName))
             begin
                 context.Author = authorName
             end
-            else if (OperatingSystem.IsWindows())
+
+.ifdef OS_WINDOWNSET
+            if (String.IsNullOrWhiteSpace(context.Author))
             begin
-                ;;No, look in the registry for the value set by InstallShield
+                ;;Look in the registry for the value set by InstallShield
                 authorName = (String)Registry.GetValue("HKEY_LOCAL_MACHINE\SOFTWARE\Synergex\CodeGen","DefaultAuthor","")
                 if (!String.IsNullOrWhiteSpace(authorName)) then
                 begin
@@ -156,14 +160,16 @@ namespace CodeGen.Engine
                     end
                 end
             end
-
+.endc
             ;;Is CODEGEN_COMPANY already set in the environment?
             data companyName = Environment.GetEnvironmentVariable("CODEGEN_COMPANY")
-            if (!String.IsNullOrWhiteSpace(companyName)) then
+            if (!String.IsNullOrWhiteSpace(companyName))
             begin
                 context.Company = companyName
             end
-            else if (OperatingSystem.IsWindows())
+
+.ifdef OS_WINDOWNSET
+            if (String.IsNullOrWhiteSpace(context.Company))
             begin
                 ;;No, look in the registry for the value set by InstallShield
                 companyName = (String)Registry.GetValue("HKEY_LOCAL_MACHINE\SOFTWARE\Synergex\CodeGen","DefaultCompany","")
@@ -181,7 +187,7 @@ namespace CodeGen.Engine
                     end
                 end
             end
-
+.endc
         endmethod
 
         public static method LoadHarmonyCoreExtensions, void

DotNetCore/MakeLinuxDistro.bat

@@ -6,6 +6,7 @@ set PATH=C:\Program Files\7-Zip;%PATH%
 pushd %~dp0
 
 if not exist distribution\linux\. mkdir distribution\linux
+if del /s /q distribution\windows\*
 
 pushd CodeGen
 echo Building Linux distribution
@@ -21,4 +22,3 @@ popd
 
 popd
 endlocal
-pause

DotNetCore/MakeWindowsDistro.bat

@@ -6,10 +6,11 @@ set PATH=C:\Program Files\7-Zip;%PATH%
 pushd %~dp0
 
 if not exist distribution\windows\.   mkdir distribution\windows
+del /s /q distribution\windows\*
 
 pushd CodeGen
 echo Building Windows distribution
-dotnet publish -c Release -r win7-x64 -o ..\distribution\windows
+dotnet publish --nologo -c Release -r win-x64 --self-contained -p:PublishTrimmed=false --verbosity minimal -o ..\distribution\windows
 popd
 
 pushd distribution
@@ -21,4 +22,3 @@ popd
 
 popd
 endlocal
-pause

HarmonyCoreCodeGen.Core/HarmonyCoreCodeGen.Core.synproj

@@ -83,8 +83,8 @@
       <HintPath>..\packages\Microsoft.Build.Utilities.Core.17.2.0\lib\net472\Microsoft.Build.Utilities.Core.dll</HintPath>
       <Private>true</Private>
     </Reference>
-    <Reference Include="Microsoft.IO.Redist, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
-      <HintPath>..\packages\Microsoft.IO.Redist.6.0.0\lib\net472\Microsoft.IO.Redist.dll</HintPath>
+    <Reference Include="Microsoft.IO.Redist, Version=6.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
+      <HintPath>..\packages\Microsoft.IO.Redist.6.0.1\lib\net472\Microsoft.IO.Redist.dll</HintPath>
       <Private>true</Private>
     </Reference>
     <Reference Include="Microsoft.NET.StringTools, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

HarmonyCoreCodeGen.Core/packages.config

@@ -5,7 +5,7 @@
   <package id="Microsoft.Build.Framework" version="17.2.0" targetFramework="net472" />
   <package id="Microsoft.Build.Locator" version="1.4.1" targetFramework="net472" />
   <package id="Microsoft.Build.Utilities.Core" version="17.2.0" targetFramework="net472" />
-  <package id="Microsoft.IO.Redist" version="6.0.0" targetFramework="net472" />
+  <package id="Microsoft.IO.Redist" version="6.0.1" targetFramework="net472" />
   <package id="Microsoft.NET.StringTools" version="1.0.0" targetFramework="net472" />
   <package id="Microsoft.VisualStudio.Setup.Configuration.Interop" version="3.2.2146" targetFramework="net472" developmentDependency="true" />
   <package id="Newtonsoft.Json" version="13.0.2" targetFramework="net472" />