Merge pull request #6 from davewalker5/target-update

Target .NET 6.0 ; Update NuGet references
davewalker5 · Apr 11, 2023 · 81ac207 · 81ac207
2 parents a66e3e0 + 041f15c
commit 81ac207
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 21 deletions.
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -12,7 +12,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100
+        dotnet-version: 6.0.310
     - name: Build
       run: dotnet build --configuration Release src/TelloCommander.sln
     - name: Run unit tests and generate code coverage

diff --git a/src/TelloCommander.Tests/TelloCommander.Tests.csproj b/src/TelloCommander.Tests/TelloCommander.Tests.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
-    <ReleaseVersion>1.0.0.5</ReleaseVersion>
+    <ReleaseVersion>1.0.0.6</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
-    <PackageReference Include="coverlet.collector" Version="3.1.0"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
+    <PackageReference Include="coverlet.collector" Version="3.2.0"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 <PrivateAssets>all</PrivateAssets>
 </PackageReference>
-    <PackageReference Include="coverlet.msbuild" Version="3.1.0">
+    <PackageReference Include="coverlet.msbuild" Version="3.2.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/TelloCommander/CommandDictionaries/CommandDictionary.cs b/src/TelloCommander/CommandDictionaries/CommandDictionary.cs
@@ -204,9 +204,8 @@ private static string GetVersionFromFilename(string filename)
         /// <returns></returns>
         private static string GetAssemblyLocation()
         {
-            string codeBase = Assembly.GetExecutingAssembly().CodeBase;
-            UriBuilder builder = new UriBuilder(codeBase);
-            string location = Path.GetDirectoryName(Uri.UnescapeDataString(builder.Path));
+            string codeBase = Assembly.GetExecutingAssembly().Location;
+            string location = Path.GetDirectoryName(codeBase);
             return location;
         }
 

diff --git a/src/TelloCommander/Commander/DroneCommander.cs b/src/TelloCommander/Commander/DroneCommander.cs
@@ -262,9 +262,8 @@ private string GetFullScriptPath(string file)
                 if (_scriptPaths.Count == 0)
                 {
                     // Get the folder containing the current assembly
-                    string codeBase = Assembly.GetExecutingAssembly().CodeBase;
-                    UriBuilder builder = new UriBuilder(codeBase);
-                    string folder = Path.GetDirectoryName(Uri.UnescapeDataString(builder.Path));
+                    string codeBase = Assembly.GetExecutingAssembly().Location;
+                    string folder = Path.GetDirectoryName(codeBase);
 
                     // Combine with the specified file to give the full path
                     fullPath = Path.Combine(folder, file);

diff --git a/src/TelloCommander/TelloCommander.csproj b/src/TelloCommander/TelloCommander.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <PackageId>TelloCommander</PackageId>
-    <ReleaseVersion>1.0.0.6</ReleaseVersion>
-    <PackageVersion>1.0.0.6</PackageVersion>
+    <ReleaseVersion>1.0.0.8</ReleaseVersion>
+    <PackageVersion>1.0.0.8</PackageVersion>
     <Authors>Dave Walker</Authors>
-    <Copyright>Copyright (c) 2020, 2021 Dave Walker</Copyright>
+    <Copyright>Copyright (c) 2020, 2021, 2023 Dave Walker</Copyright>
     <Owners>Dave Walker</Owners>
     <PackageProjectUrl>https://github.com/davewalker5/TelloCommander</PackageProjectUrl>
     <PackageReleaseNotes>Dependency updates</PackageReleaseNotes>

diff --git a/src/TelloSimulator/TelloSimulator.csproj b/src/TelloSimulator/TelloSimulator.csproj
@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
-    <ReleaseVersion>1.0.0.5</ReleaseVersion>
+    <TargetFramework>net6.0</TargetFramework>
+    <ReleaseVersion>1.0.0.7</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>