conversion to net6

CreateDeliverables.cmd

@@ -5,16 +5,16 @@ rd JWLMerge\bin /q /s
 rd JWLMergeCLI\bin /q /s
 rd Installer\Output /q /s
 
-REM build / publishtar --help
+REM build / publish
 
 dotnet publish JWLMerge\JWLMerge.csproj -p:PublishProfile=FolderProfile -c:Release
 dotnet publish JWLMergeCLI\JWLMergeCLI.csproj -p:PublishProfile=FolderProfile -c:Release
 
 REM copy items into delivery
-xcopy JWLMergeCLI\bin\Release\net5.0\publish\*.* JWLMerge\bin\Release\net5.0-windows\publish /q /s /y /d
+xcopy JWLMergeCLI\bin\Release\net6.0\publish\*.* JWLMerge\bin\Release\net6.0-windows\publish /q /s /y /d
 
 REM Create installer
 "C:\Program Files (x86)\Inno Setup 6\iscc" Installer\jwlmergesetup.iss
 
 REM create portable zip
-powershell Compress-Archive -Path JWLMerge\bin\Release\net5.0-windows\publish\* -DestinationPath Installer\Output\JWLMergePortable.zip 
+powershell Compress-Archive -Path JWLMerge\bin\Release\net6.0-windows\publish\* -DestinationPath Installer\Output\JWLMergePortable.zip 

Installer/JWLMergeSetup.iss

@@ -9,7 +9,7 @@
 #define MyAppURL "https://github.com/AntonyCorbett/JWLMerge"
 #define MyAppExeName "JWLMerge.exe"
 
-#define MyAppVersion GetFileVersion('..\JWLMerge\bin\Release\net5.0-windows\publish\JWLMerge.exe');
+#define MyAppVersion GetFileVersion('..\JWLMerge\bin\Release\net6.0-windows\publish\JWLMerge.exe');
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
@@ -58,7 +58,7 @@ Type: filesandordirs; Name: "{app}\ref"
 Type: filesandordirs; Name: "{app}\runtimes"
 
 [Files]
-Source: "..\JWLMerge\bin\Release\net5.0-windows\publish\*"; DestDir: "{app}"; Flags: ignoreversion; Excludes: "*.pdb"
+Source: "..\JWLMerge\bin\Release\net6.0-windows\publish\*"; DestDir: "{app}"; Flags: ignoreversion; Excludes: "*.pdb"
 
 // https://go.microsoft.com/fwlink/?linkid=2135256
 Source: "netcorecheck.exe"; Flags: dontcopy noencryption
@@ -93,9 +93,9 @@ end;
 
 function InitializeSetup: Boolean;
 begin
-  // add dependencies (.NET 5 x86 desktop runtime)  
+  // add dependencies (.NET 6 x86 desktop runtime)  
   Dependency_ForceX86 := true;  
-  Dependency_AddDotNet50Desktop;    
+  Dependency_AddDotNet60Desktop;    
   
   Result := True;  
 end;

JWLMerge.Tests/JWLMerge.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <Nullable>Enable</Nullable>
     <IsPackable>false</IsPackable>

JWLMerge/JWLMerge.csproj

@@ -1,64 +1,57 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <Nullable>Enable</Nullable>
     <ApplicationIcon>JWLMerge.ico</ApplicationIcon>
     <Platforms>AnyCPU</Platforms>
   </PropertyGroup>
-
   <ItemGroup>
     <Compile Include="..\SolutionInfo.cs" Link="Properties\SolutionInfo.cs" />
   </ItemGroup>
-
   <ItemGroup>
     <None Include="..\.editorconfig" Link=".editorconfig" />
   </ItemGroup>
-
   <ItemGroup>
-    <PackageReference Include="MaterialDesignColors" Version="2.0.1" />
     <PackageReference Include="MaterialDesignThemes" Version="4.1.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
     <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.0.2" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
+    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.3.261302">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\JWLMerge.BackupFileServices\JWLMerge.BackupFileServices.csproj" />
     <ProjectReference Include="..\JWLMerge.ExcelServices\JWLMerge.ExcelServices.csproj" />
   </ItemGroup>
-
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
   </ItemGroup>
-
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-
   <ItemGroup>
     <Compile Update="Properties\Settings.Designer.cs">
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <AutoGen>True</AutoGen>
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
   </ItemGroup>
-
   <ItemGroup>
     <None Update="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
   </ItemGroup>
-
-</Project>
+</Project>

JWLMerge/Properties/PublishProfiles/FolderProfile.pubxml

@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>x86</Platform>
-    <PublishDir>bin\Release\net5.0-windows\publish\</PublishDir>
+    <PublishDir>bin\Release\net6.0-windows\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <TargetFramework>net5.0-windows</TargetFramework>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>

JWLMergeCLI/JWLMergeCLI.csproj

@@ -1,24 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <Nullable>Enable</Nullable>
     <ApplicationIcon>JWLMerge.ico</ApplicationIcon>
     <Platforms>AnyCPU</Platforms>
   </PropertyGroup>
-
   <ItemGroup>
     <Compile Include="..\SolutionInfo.cs" Link="Properties\SolutionInfo.cs" />
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
+    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.3.261302">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\JWLMerge.BackupFileServices\JWLMerge.BackupFileServices.csproj" />
   </ItemGroup>
-
-</Project>
+</Project>

JWLMergeCLI/Properties/PublishProfiles/FolderProfile.pubxml

@@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>x86</Platform>
-    <PublishDir>bin\Release\net5.0\publish\</PublishDir>
+    <PublishDir>bin\Release\net6.0\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <TargetFramework>net5.0</TargetFramework>
     <SelfContained>false</SelfContained>

SolutionInfo.cs

@@ -6,4 +6,4 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("2.0.0.6")]
+[assembly: AssemblyVersion("2.0.0.7")]