Update to .net8 (#83)

Autodesk-Forge · Jun 22, 2024 · ec5457b · ec5457b
1 parent 49c656f
commit ec5457b
Show file tree

Hide file tree

Showing 13 changed files with 54 additions and 51 deletions.
diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
@@ -23,7 +23,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v3

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
  <PropertyGroup>
-   <TargetFramework>net6.0</TargetFramework>
+   <TargetFramework>net8.0</TargetFramework>
    <ImplicitUsings>enable</ImplicitUsings>
  </PropertyGroup>
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -0,0 +1,2 @@
+<Project>
+</Project>
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ For clients with straightforward needs one high level API client is provided in
 
 ### Requirements
 
-- [.NET 6](https://dotnet.microsoft.com/en-us/download/dotnet/6.0) or later
+- [.NET 8](https://dotnet.microsoft.com/en-us/download/dotnet/8.0) or later
 - A registered app on the [Forge Developer Portal](http://forge.autodesk.com). 
 
 ### Dependencies

diff --git a/src/Autodesk.Forge.DesignAutomation/Autodesk.Forge.DesignAutomation.csproj b/src/Autodesk.Forge.DesignAutomation/Autodesk.Forge.DesignAutomation.csproj
@@ -1,34 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <authors>Autodesk Forge</authors>
-    <owners>Autodesk Forge</owners>
-    <Company>Autodesk</Company>
-    <Product>Autodesk Forge</Product>
     <Description>Client sdk for Forge DesignAutomation API</Description>
-    <Copyright>Autodesk Inc.</Copyright>
-    <Version>5.1.2</Version>
-    <PackageId>Autodesk.Forge.DesignAutomation</PackageId>
-    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-    <PackageProjectUrl>https://github.com/Autodesk-Forge/forge-api-dotnet-design.automation</PackageProjectUrl>
-    <PackageIcon>logo_forge-2-line.png</PackageIcon>
-    <PackageReleaseNotes>For full release notes see https://github.com/Autodesk-Forge/forge-api-dotnet-design.automation/blob/master/CHANGELOG.md</PackageReleaseNotes>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <PackageVersion>6.0.0</PackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\..\images\logo_forge-2-line.png" Pack="true" PackagePath="\" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Autodesk.Forge.Core" Version="3.0.2" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+    <PackageReference Include="Autodesk.Forge.Core" Version="4.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
-  <Import Project="..\..\nuget.targets" />
 </Project>
 
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -0,0 +1,20 @@
+<Project>
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+    <PropertyGroup>
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+        <Authors>Autodesk</Authors>
+        <Copyright>Autodesk Inc.</Copyright>
+        <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+        <PackageProjectUrl>https://github.com/Autodesk-Forge/forge-api-dotnet-core</PackageProjectUrl>
+        <PackageIcon>logo_forge-2-line.png</PackageIcon>
+        <PackageReleaseNotes>For full release notes see https://github.com/Autodesk-Forge/forge-api-dotnet-core/blob/master/CHANGELOG.md</PackageReleaseNotes>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <IncludeSymbols>true</IncludeSymbols>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    </PropertyGroup>
+    <ItemGroup>
+        <None Include="..\..\images\logo_forge-2-line.png" Pack="true" PackagePath="\" />
+        <None Include="..\..\README.md" Pack="true" PackagePath="\" />
+    </ItemGroup>
+</Project>
diff --git a/nuget.targets → src/Directory.Build.targets b/nuget.targets → src/Directory.Build.targets
@@ -1,11 +1,12 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
   <!-- Push the nuget package that this project builds to nuget.org
   Ignore exit code so failures including the value of NugetApiKey do not get echo-ed.
   Continue on errors. Publishing can fail if the package version isn't updated and we get conflict.
   -->
   <Target Name="Push" DependsOnTargets="Pack">
-    <Exec Command="dotnet nuget push @(NuGetPackOutput->WithMetadataValue('Extension','.nupkg')) -k=$(NugetApiKey) -s nuget.org --skip-duplicate"
-          IgnoreExitCode="false"
-          ContinueOnError="false"/>
+    <Exec Command="dotnet nuget push @(NuGetPackOutput->WithMetadataValue('Extension','.nupkg')) -k=$(NugetApiKey) -s nuget.org"
+          IgnoreExitCode="true"
+          ContinueOnError="true"/>
   </Target>
 </Project>
diff --git a/tests/e2e/E2eTests.csproj b/tests/e2e/E2eTests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
@@ -18,11 +18,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autodesk.Forge.Core.E2eTestHelpers" Version="3.0.1" />
+    <PackageReference Include="Autodesk.Forge.Core.E2eTestHelpers" Version="4.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.6" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/tests/e2e/TestActivities.cs b/tests/e2e/TestActivities.cs
@@ -49,7 +49,7 @@ public partial class Tests
 
         [Fact]
         [Order(Weight = 2.0)]
-        public async void Activities_Create()
+        public async Task Activities_Create()
         {
             using (Fixture.StartTestScope())
             {
@@ -59,7 +59,7 @@ public async void Activities_Create()
 
         [Fact]
         [Order(Weight = 2.1)]
-        public async void Activities_GetAll()
+        public async Task Activities_GetAll()
         {
             using (Fixture.StartTestScope())
             {

diff --git a/tests/e2e/TestAppBundlesApi.cs b/tests/e2e/TestAppBundlesApi.cs
@@ -33,7 +33,7 @@ public partial class Tests
 
         [Fact]
         [Order(Weight = 1.0)]
-        public async void AppBundles_Create()
+        public async Task AppBundles_Create()
         {
             using (Fixture.StartTestScope())
             {
@@ -44,7 +44,7 @@ public async void AppBundles_Create()
 
         [Fact]
         [Order(Weight = 1.1)]
-        public async void AppBundles_Update()
+        public async Task AppBundles_Update()
         {
             using (Fixture.StartTestScope())
             {
@@ -58,7 +58,7 @@ public async void AppBundles_Update()
 
         [Fact]
         [Order(Weight = 1.2)]
-        public async void AppBundles_GetAll()
+        public async Task AppBundles_GetAll()
         {
             using (Fixture.StartTestScope())
             {
@@ -73,7 +73,7 @@ public async void AppBundles_GetAll()
 
         [Fact]
         [Order(Weight = 1.3)]
-        public async void AppBundles_GetAllAlias()
+        public async Task AppBundles_GetAllAlias()
         {
             using (Fixture.StartTestScope())
             {
@@ -86,7 +86,7 @@ public async void AppBundles_GetAllAlias()
 
         [Fact]
         [Order(Weight = 1.4)]
-        public async void AppBundles_GetAllVersion()
+        public async Task AppBundles_GetAllVersion()
         {
             using (Fixture.StartTestScope())
             {

diff --git a/tests/e2e/TestForgeAppsApi.cs b/tests/e2e/TestForgeAppsApi.cs
@@ -30,7 +30,7 @@ public partial class Tests
 
         [Fact]
         [Order(Weight = 0.0)]
-        public async void ForgeApps_Delete()
+        public async Task ForgeApps_Delete()
         {
             using (var scope = Fixture.StartTestScope())
             {
@@ -44,7 +44,7 @@ public async void ForgeApps_Delete()
 
         [Fact]
         [Order(Weight = 0.1)]
-        public async void ForgeApps_CreateNickname()
+        public async Task ForgeApps_CreateNickname()
         {
             using (Fixture.StartTestScope())
             {
@@ -54,7 +54,7 @@ public async void ForgeApps_CreateNickname()
 
         [Fact]
         [Order(Weight = 0.2)]
-        public async void ForgeApps_GetNickname()
+        public async Task ForgeApps_GetNickname()
         {
             using (Fixture.StartTestScope())
             {
@@ -65,7 +65,7 @@ public async void ForgeApps_GetNickname()
 
         [Fact]
         [Order(Weight = 0.3)]
-        public async void ForgeApps_CreateNicknameRecord()
+        public async Task ForgeApps_CreateNicknameRecord()
         {
             using (Fixture.StartTestScope())
             {
@@ -75,7 +75,7 @@ public async void ForgeApps_CreateNicknameRecord()
 
         [Fact]
         [Order(Weight = 0.4)]
-        public async void ForgeApps_GetNicknameRecord()
+        public async Task ForgeApps_GetNicknameRecord()
         {
             using (Fixture.StartTestScope())
             {

diff --git a/tests/e2e/TestServiceLimits.cs b/tests/e2e/TestServiceLimits.cs
@@ -27,7 +27,7 @@ public partial class Tests
     {
         [Fact]
         [Order(Weight = 3.0)]
-        public async void ServiceLimits_Get()
+        public async Task ServiceLimits_Get()
         {
             using (Fixture.StartTestScope())
             {
@@ -37,7 +37,7 @@ public async void ServiceLimits_Get()
 
         [Fact]
         [Order(Weight = 3.1)]
-        public async void ServiceLimits_Update()
+        public async Task ServiceLimits_Update()
         {
             using (Fixture.StartTestScope())
             {

diff --git a/tests/e2e/TestWorkitems.cs b/tests/e2e/TestWorkitems.cs
@@ -28,7 +28,7 @@ public partial class Tests
     {
         [Fact]
         [Order(Weight = 3.0)]
-        public async void WorkItems_Create()
+        public async Task WorkItems_Create()
         {
             using (var testScope = Fixture.StartTestScope())
             {
@@ -60,7 +60,7 @@ public async void WorkItems_Create()
 
         [Fact]
         [Order(Weight = 3.0)]
-        public async void WorkItems_CreateWithStringPayload()
+        public async Task WorkItems_CreateWithStringPayload()
         {
             using (var testScope = Fixture.StartTestScope())
             {