Upgrade to .NET 4.8 to match upcoming Warfare 2 update.

Gwindalmir · Jan 24, 2022 · 479582c · 479582c
1 parent b017906
commit 479582c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,7 +23,8 @@ env:
   SOLUTION_FILE_PATH: WorkshopTool.sln
 
   BUILD_CONFIGURATION: ${{ github.event.inputs.configuration || 'Release' }}
-  BUILD_FRAMEWORK: net461
+  BUILD_FRAMEWORK: net48
+  BUILD_FRAMEWORK_ME: net461
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -70,7 +71,7 @@ jobs:
       id: artifact-mewt
       with:
         name: MEWT
-        path: MEWorkshopTool/bin/${{env.BUILD_CONFIGURATION}}/${{env.BUILD_FRAMEWORK}}/MEWorkshopTool*.zip
+        path: MEWorkshopTool/bin/${{env.BUILD_CONFIGURATION}}/${{env.BUILD_FRAMEWORK_ME}}/MEWorkshopTool*.zip
 
     - uses: ncipollo/release-action@v1
       name: Publish Release

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -29,7 +29,7 @@ env:
   SOLUTION_FILE_PATH: WorkshopTool.sln
 
   BUILD_CONFIGURATION: ${{ github.event.inputs.configuration || 'Release' }}
-  BUILD_FRAMEWORK: net461
+  BUILD_FRAMEWORK: net48
   MANUAL_TRIGGER: ${{ github.event.workflow != null }}
 
 jobs:

diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ Please note, this is a command-line application only. A GUI may be considered in
 * [Build Tools for Visual Studio 2017](https://visualstudio.microsoft.com/vs/older-downloads/#visual-studio-2017-and-other-products) 15.7 or higher at a *minimum*.
   * Or the full [Visual Studio Community 2017](https://visualstudio.microsoft.com/vs/older-downloads/#visual-studio-2017-and-other-products) 15.7 or higher, if preferred instead
   * JetBrains Rider is reported as working by the community as another alternative
-* .NET Framework 4.6.1 Targeting Pack for Visual Studio, or the [Developer Pack](https://dotnet.microsoft.com/download/dotnet-framework/net461) if using the Build Tools
+* .NET Framework 4.8 Targeting Pack for Visual Studio, or the [Developer Pack](https://dotnet.microsoft.com/download/dotnet-framework/net48) if using the Build Tools
   * SE targets this version
 * [.NET Core SDK 2.1.300](https://www.microsoft.com/net/download/dotnet-core/sdk-2.1.300) or higher
 

diff --git a/SEWorkshopTool/SEWorkshopTool.csproj b/SEWorkshopTool/SEWorkshopTool.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <OutputType>Exe</OutputType>
     <RootNamespace>Phoenix.SEWorkshopTool</RootNamespace>
     <PlatformTarget>x64</PlatformTarget>
@@ -49,6 +49,7 @@
     <Reference Include="Microsoft.CSharp">
       <Private>false</Private>
     </Reference>
+    <Reference Include="System.Net.Http" />
     <Reference Include="VRage, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>Bin64\VRage.dll</HintPath>

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
 
     <IsPackable>false</IsPackable>