From ab798cfbe69a0d6cd2ee5fdf9a9375d6b4dd46dd Mon Sep 17 00:00:00 2001 From: Lance McCarthy <LanceMcCarthy@users.noreply.github.com> Date: Thu, 18 Jul 2024 18:12:42 -0400 Subject: [PATCH 1/2] Update everything to net8. Update workflows to latest --- .github/workflows/cd_release_msstore.yml | 8 ++++---- .github/workflows/cd_release_sideload.yml | 12 ++++++------ .github/workflows/ci_dev.yml | 10 +++++----- .github/workflows/ci_main.yml | 10 +++++----- .../MediaFileManager.Common.csproj | 2 +- .../MediaFileManager.Desktop.csproj | 2 +- .../PackageProject/PackageProject.wapproj | 6 +++--- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/cd_release_msstore.yml b/.github/workflows/cd_release_msstore.yml index 3b5621d..79b7be3 100644 --- a/.github/workflows/cd_release_msstore.yml +++ b/.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: net8.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/setup-msbuild@v1.3.1 + uses: microsoft/setup-msbuild@v1.3.2 # Use dotnet restore command for the solution (see RIDs https://docs.microsoft.com/en-us/dotnet/core/rid-catalog) - name: DotNet Restore diff --git a/.github/workflows/cd_release_sideload.yml b/.github/workflows/cd_release_sideload.yml index 116ef11..ab9a424 100644 --- a/.github/workflows/cd_release_sideload.yml +++ b/.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: net8.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/setup-msbuild@v1.3.1 + uses: microsoft/setup-msbuild@v1.3.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 diff --git a/.github/workflows/ci_dev.yml b/.github/workflows/ci_dev.yml index c2ce03b..d0455a6 100644 --- a/.github/workflows/ci_dev.yml +++ b/.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: net8.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/setup-msbuild@v1.3.1 + uses: microsoft/setup-msbuild@v1.3.2 # Use dotnet restore command for the solution (see RIDs https://docs.microsoft.com/en-us/dotnet/core/rid-catalog) - name: DotNet Restore diff --git a/.github/workflows/ci_main.yml b/.github/workflows/ci_main.yml index d7eb4a7..27756c0 100644 --- a/.github/workflows/ci_main.yml +++ b/.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: net8.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/setup-msbuild@v1.3.1 + uses: microsoft/setup-msbuild@v1.3.2 with: msbuild-architecture: x64 diff --git a/src/MediaFileManager/MediaFileManager.Common/MediaFileManager.Common.csproj b/src/MediaFileManager/MediaFileManager.Common/MediaFileManager.Common.csproj index e8a0c42..3939a90 100644 --- a/src/MediaFileManager/MediaFileManager.Common/MediaFileManager.Common.csproj +++ b/src/MediaFileManager/MediaFileManager.Common/MediaFileManager.Common.csproj @@ -1,6 +1,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>net7.0</TargetFramework> + <TargetFramework>net8.0</TargetFramework> <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers> <ImplicitUsings>enable</ImplicitUsings> </PropertyGroup> diff --git a/src/MediaFileManager/MediaFileManager.Desktop/MediaFileManager.Desktop.csproj b/src/MediaFileManager/MediaFileManager.Desktop/MediaFileManager.Desktop.csproj index 3c8d201..eda0173 100644 --- a/src/MediaFileManager/MediaFileManager.Desktop/MediaFileManager.Desktop.csproj +++ b/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>net8.0-windows10.0.19041.0</TargetFramework> <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion> <RootNamespace>MediaFileManager.Desktop</RootNamespace> <AssemblyName>MediaFileManager.Desktop</AssemblyName> diff --git a/src/MediaFileManager/PackageProject/PackageProject.wapproj b/src/MediaFileManager/PackageProject/PackageProject.wapproj index 6d83322..b76b167 100644 --- a/src/MediaFileManager/PackageProject/PackageProject.wapproj +++ b/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)' < '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)' < '17.0'"> + <VisualStudioVersion>17.0</VisualStudioVersion> </PropertyGroup> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|x86"> From a2e5e1c934c90c535c13af0eb7f3e0f08baeea4c Mon Sep 17 00:00:00 2001 From: Lance McCarthy <LanceMcCarthy@users.noreply.github.com> Date: Thu, 18 Jul 2024 18:28:57 -0400 Subject: [PATCH 2/2] Revert TFM to net6 for latest viable support --- .github/workflows/cd_release_msstore.yml | 2 +- .github/workflows/cd_release_sideload.yml | 2 +- .github/workflows/ci_dev.yml | 2 +- .github/workflows/ci_main.yml | 2 +- .../MediaFileManager.Common/MediaFileManager.Common.csproj | 2 +- .../MediaFileManager.Desktop/MediaFileManager.Desktop.csproj | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cd_release_msstore.yml b/.github/workflows/cd_release_msstore.yml index 79b7be3..ba2944a 100644 --- a/.github/workflows/cd_release_msstore.yml +++ b/.github/workflows/cd_release_msstore.yml @@ -21,7 +21,7 @@ jobs: SolutionPath: src\MediaFileManager\MediaFileManager.sln Configuration: Release AppxBundlePlatforms: "x86|x64|arm64" - TFM: net8.0-windows10.0.19041.0 + TFM: net6.0-windows10.0.19041.0 AppxBundleMode: Always AppxBuildMode: StoreUpload AppxPackageSigningEnabled: False diff --git a/.github/workflows/cd_release_sideload.yml b/.github/workflows/cd_release_sideload.yml index ab9a424..f6a2295 100644 --- a/.github/workflows/cd_release_sideload.yml +++ b/.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: net8.0-windows10.0.19041.0 + TFM: net6.0-windows10.0.19041.0 TargetPlatform: "x64" AppxBundlePlatforms: "x86|x64|arm64" AppxBundleMode: Always diff --git a/.github/workflows/ci_dev.yml b/.github/workflows/ci_dev.yml index d0455a6..1fa5b5d 100644 --- a/.github/workflows/ci_dev.yml +++ b/.github/workflows/ci_dev.yml @@ -14,7 +14,7 @@ jobs: build_dev: runs-on: windows-latest env: - TFM: net8.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 diff --git a/.github/workflows/ci_main.yml b/.github/workflows/ci_main.yml index 27756c0..54fa9a8 100644 --- a/.github/workflows/ci_main.yml +++ b/.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: net8.0-windows10.0.19041.0 + TFM: net6.0-windows10.0.19041.0 TargetPlatform: "x64" AppxBuildMode: CI AppxBundlePlatforms: "x86|x64|arm64" diff --git a/src/MediaFileManager/MediaFileManager.Common/MediaFileManager.Common.csproj b/src/MediaFileManager/MediaFileManager.Common/MediaFileManager.Common.csproj index 3939a90..ff0b594 100644 --- a/src/MediaFileManager/MediaFileManager.Common/MediaFileManager.Common.csproj +++ b/src/MediaFileManager/MediaFileManager.Common/MediaFileManager.Common.csproj @@ -1,6 +1,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>net8.0</TargetFramework> + <TargetFramework>net6.0</TargetFramework> <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers> <ImplicitUsings>enable</ImplicitUsings> </PropertyGroup> diff --git a/src/MediaFileManager/MediaFileManager.Desktop/MediaFileManager.Desktop.csproj b/src/MediaFileManager/MediaFileManager.Desktop/MediaFileManager.Desktop.csproj index eda0173..6fb2b8f 100644 --- a/src/MediaFileManager/MediaFileManager.Desktop/MediaFileManager.Desktop.csproj +++ b/src/MediaFileManager/MediaFileManager.Desktop/MediaFileManager.Desktop.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <OutputType>WinExe</OutputType> - <TargetFramework>net8.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>