Merge pull request #199 from LanceMcCarthy/main-dev

Update workflows and TFM

.github/workflows/cd_release_msstore.yml

@@ -21,7 +21,7 @@ jobs:
       SolutionPath: src\MediaFileManager\MediaFileManager.sln
       Configuration: Release
       AppxBundlePlatforms: "x86|x64|arm64"
-      TFM: net7.0-windows10.0.19041.0
+      TFM: net6.0-windows10.0.19041.0
       AppxBundleMode: Always
       AppxBuildMode: StoreUpload
       AppxPackageSigningEnabled: False
@@ -97,12 +97,12 @@ jobs:
 
     # Install the .NET SDK workload
     - name: Install .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '7.0'
+        dotnet-version: '8.0'
 
     - name: Setup MSBuild.exe
-      uses: microsoft/[email protected].1
+      uses: microsoft/[email protected].2
 
     # Use dotnet restore command for the solution (see RIDs https://docs.microsoft.com/en-us/dotnet/core/rid-catalog)
     - name: DotNet Restore

.github/workflows/cd_release_sideload.yml

@@ -25,7 +25,7 @@ jobs:
       AppxPackageDirectory: D:\a\MediaFileManager\MediaFileManager\src\MediaFileManager\PackageProject\SideLoadPackages\
       ArtifactsFilePath: D:\a\MediaFileManager\MediaFileManager\src\MediaFileManager\PackageProject\SideLoadPackages\SideLoadPackages.zip
       AppInstUri: https://dvlup.blob.core.windows.net/general-app-files/Installers/MediaFileManager/
-      TFM: net7.0-windows10.0.19041.0
+      TFM: net6.0-windows10.0.19041.0
       TargetPlatform: "x64"
       AppxBundlePlatforms: "x86|x64|arm64"
       AppxBundleMode: Always
@@ -37,7 +37,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
@@ -94,12 +94,12 @@ jobs:
 
     # Install the .NET SDK workload
     - name: Install .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '7.0'
+        dotnet-version: '8.0'
 
     - name: Setup MSBuild.exe
-      uses: microsoft/[email protected].1
+      uses: microsoft/[email protected].2
 
     # Use dotnet restore command for the solution (see RIDs https://docs.microsoft.com/en-us/dotnet/core/rid-catalog)
     - name: DotNet Restore
@@ -126,7 +126,7 @@ jobs:
     # This automatically distributes the sideLoad package, which users can visit the index.html page and run the appinstaller
     - name: Uploading appInstaller to Azure Blob
       id: sideload-blob-upload
-      uses: LanceMcCarthy/Action-AzureBlobUpload@v1.9.0
+      uses: LanceMcCarthy/Action-AzureBlobUpload@v3
       with:
         connection_string: "${{ secrets.AZURE_DVLUP_BLOB_CONNECTION_STRING }}"
         container_name: general-app-files

.github/workflows/ci_dev.yml

@@ -14,7 +14,7 @@ jobs:
   build_dev:
     runs-on: windows-latest
     env:
-      TFM: net7.0-windows10.0.19041.0
+      TFM: net6.0-windows10.0.19041.0
       WpfProjectPath: src\MediaFileManager\MediaFileManager.Desktop\MediaFileManager.Desktop.csproj
       WappProjectPath: src\MediaFileManager\PackageProject\PackageProject.wapproj
       SolutionPath: src\MediaFileManager\MediaFileManager.sln
@@ -48,19 +48,19 @@ jobs:
     #     echo "Output (using deprecated set-output): ${{ steps.version-creator.outputs.APP_VERSION }}"
 
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
     # Install the .NET SDK workload
     - name: Install .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '7.0'
+        dotnet-version: '8.0'
 
     # Add msbuild to the PATH: https://github.com/microsoft/setup-msbuild
     - name: Setup MSBuild.exe
-      uses: microsoft/[email protected].1
+      uses: microsoft/[email protected].2
 
     # Use dotnet restore command for the solution (see RIDs https://docs.microsoft.com/en-us/dotnet/core/rid-catalog)
     - name: DotNet Restore

.github/workflows/ci_main.yml

@@ -20,7 +20,7 @@ jobs:
       CommonProjectPath: src\MediaFileManager\MediaFileManager.Common\MediaFileManager.Common.csproj
       WpfProjectPath: src\MediaFileManager\MediaFileManager.Desktop\MediaFileManager.Desktop.csproj
       SolutionPath: src\MediaFileManager\MediaFileManager.sln
-      TFM: net7.0-windows10.0.19041.0
+      TFM: net6.0-windows10.0.19041.0
       TargetPlatform: "x64"
       AppxBuildMode: CI
       AppxBundlePlatforms: "x86|x64|arm64"
@@ -31,7 +31,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
@@ -70,12 +70,12 @@ jobs:
         SetAssemblyFileVersion $assemblyInfoPath "${{ steps.version-creator.outputs.APP_VERSION }}"
 
     - name: Install .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '7.0'
+        dotnet-version: '8.0'
 
     - name: Setup MSBuild.exe
-      uses: microsoft/[email protected].1
+      uses: microsoft/[email protected].2
       with:
         msbuild-architecture: x64
 

src/MediaFileManager/MediaFileManager.Common/MediaFileManager.Common.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>

src/MediaFileManager/MediaFileManager.Desktop/MediaFileManager.Desktop.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+        <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
 	    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
         <RootNamespace>MediaFileManager.Desktop</RootNamespace>
         <AssemblyName>MediaFileManager.Desktop</AssemblyName>

src/MediaFileManager/PackageProject/PackageProject.wapproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
-    <VisualStudioVersion>15.0</VisualStudioVersion>
+<Project ToolsVersion="17.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '17.0'">
+    <VisualStudioVersion>17.0</VisualStudioVersion>
   </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x86">