Skip to content

Commit ec5457b

Browse files
szilvaaszilvaa
authored
Update to .net8 (#83)
1 parent 49c656f commit ec5457b

File tree

13 files changed

+54
-51
lines changed

13 files changed

+54
-51
lines changed

‎.github/workflows/dotnet-core.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Setup .NET Core
2424
uses: actions/setup-dotnet@v4
2525
with:
26-
dotnet-version: 6.0.x
26+
dotnet-version: 8.0.x
2727

2828
- name: Initialize CodeQL
2929
uses: github/codeql-action/init@v3

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<ImplicitUsings>enable</ImplicitUsings>
55
</PropertyGroup>
66
</Project>

‎Directory.Build.targets‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<Project>
2+
</Project>

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ For clients with straightforward needs one high level API client is provided in
1616

1717
### Requirements
1818

19-
- [.NET 6](https://dotnet.microsoft.com/en-us/download/dotnet/6.0) or later
19+
- [.NET 8](https://dotnet.microsoft.com/en-us/download/dotnet/8.0) or later
2020
- A registered app on the [Forge Developer Portal](http://forge.autodesk.com).
2121

2222
### Dependencies

‎src/Autodesk.Forge.DesignAutomation/Autodesk.Forge.DesignAutomation.csproj‎

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,14 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
5-
<authors>Autodesk Forge</authors>
6-
<owners>Autodesk Forge</owners>
7-
<Company>Autodesk</Company>
8-
<Product>Autodesk Forge</Product>
94
<Description>Client sdk for Forge DesignAutomation API</Description>
10-
<Copyright>Autodesk Inc.</Copyright>
11-
<Version>5.1.2</Version>
12-
<PackageId>Autodesk.Forge.DesignAutomation</PackageId>
13-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
14-
<PackageProjectUrl>https://github.com/Autodesk-Forge/forge-api-dotnet-design.automation</PackageProjectUrl>
15-
<PackageIcon>logo_forge-2-line.png</PackageIcon>
16-
<PackageReleaseNotes>For full release notes see https://github.com/Autodesk-Forge/forge-api-dotnet-design.automation/blob/master/CHANGELOG.md</PackageReleaseNotes>
17-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
18-
<IncludeSymbols>true</IncludeSymbols>
19-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
5+
<PackageVersion>6.0.0</PackageVersion>
206
</PropertyGroup>
217

228
<ItemGroup>
23-
<None Include="..\..\images\logo_forge-2-line.png" Pack="true" PackagePath="\" />
24-
</ItemGroup>
25-
26-
<ItemGroup>
27-
<PackageReference Include="Autodesk.Forge.Core" Version="3.0.2" />
28-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
9+
<PackageReference Include="Autodesk.Forge.Core" Version="4.0.0" />
2910
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
3011
</ItemGroup>
3112

32-
<Import Project="..\..\nuget.targets" />
3313
</Project>
3414

‎src/Directory.Build.props‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
3+
<PropertyGroup>
4+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
5+
<Authors>Autodesk</Authors>
6+
<Copyright>Autodesk Inc.</Copyright>
7+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
8+
<PackageProjectUrl>https://github.com/Autodesk-Forge/forge-api-dotnet-core</PackageProjectUrl>
9+
<PackageIcon>logo_forge-2-line.png</PackageIcon>
10+
<PackageReleaseNotes>For full release notes see https://github.com/Autodesk-Forge/forge-api-dotnet-core/blob/master/CHANGELOG.md</PackageReleaseNotes>
11+
<PackageReadmeFile>README.md</PackageReadmeFile>
12+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
13+
<IncludeSymbols>true</IncludeSymbols>
14+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
15+
</PropertyGroup>
16+
<ItemGroup>
17+
<None Include="..\..\images\logo_forge-2-line.png" Pack="true" PackagePath="\" />
18+
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
19+
</ItemGroup>
20+
</Project>

‎nuget.targets‎ renamed to ‎src/Directory.Build.targets‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
23
<!-- Push the nuget package that this project builds to nuget.org
34
Ignore exit code so failures including the value of NugetApiKey do not get echo-ed.
45
Continue on errors. Publishing can fail if the package version isn't updated and we get conflict.
56
-->
67
<Target Name="Push" DependsOnTargets="Pack">
7-
<Exec Command="dotnet nuget push @(NuGetPackOutput->WithMetadataValue('Extension','.nupkg')) -k=$(NugetApiKey) -s nuget.org --skip-duplicate"
8-
IgnoreExitCode="false"
9-
ContinueOnError="false"/>
8+
<Exec Command="dotnet nuget push @(NuGetPackOutput->WithMetadataValue('Extension','.nupkg')) -k=$(NugetApiKey) -s nuget.org"
9+
IgnoreExitCode="true"
10+
ContinueOnError="true"/>
1011
</Target>
1112
</Project>

‎tests/e2e/E2eTests.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<IsPackable>false</IsPackable>
@@ -18,11 +18,11 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Autodesk.Forge.Core.E2eTestHelpers" Version="3.0.1" />
21+
<PackageReference Include="Autodesk.Forge.Core.E2eTestHelpers" Version="4.0.0" />
2222
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
23-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
24-
<PackageReference Include="xunit" Version="2.6.6" />
25-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
23+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
24+
<PackageReference Include="xunit" Version="2.8.1" />
25+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
2626
<PrivateAssets>all</PrivateAssets>
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2828
</PackageReference>

‎tests/e2e/TestActivities.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public partial class Tests
4949

5050
[Fact]
5151
[Order(Weight = 2.0)]
52-
public async void Activities_Create()
52+
public async Task Activities_Create()
5353
{
5454
using (Fixture.StartTestScope())
5555
{
@@ -59,7 +59,7 @@ public async void Activities_Create()
5959

6060
[Fact]
6161
[Order(Weight = 2.1)]
62-
public async void Activities_GetAll()
62+
public async Task Activities_GetAll()
6363
{
6464
using (Fixture.StartTestScope())
6565
{

‎tests/e2e/TestAppBundlesApi.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public partial class Tests
3333

3434
[Fact]
3535
[Order(Weight = 1.0)]
36-
public async void AppBundles_Create()
36+
public async Task AppBundles_Create()
3737
{
3838
using (Fixture.StartTestScope())
3939
{
@@ -44,7 +44,7 @@ public async void AppBundles_Create()
4444

4545
[Fact]
4646
[Order(Weight = 1.1)]
47-
public async void AppBundles_Update()
47+
public async Task AppBundles_Update()
4848
{
4949
using (Fixture.StartTestScope())
5050
{
@@ -58,7 +58,7 @@ public async void AppBundles_Update()
5858

5959
[Fact]
6060
[Order(Weight = 1.2)]
61-
public async void AppBundles_GetAll()
61+
public async Task AppBundles_GetAll()
6262
{
6363
using (Fixture.StartTestScope())
6464
{
@@ -73,7 +73,7 @@ public async void AppBundles_GetAll()
7373

7474
[Fact]
7575
[Order(Weight = 1.3)]
76-
public async void AppBundles_GetAllAlias()
76+
public async Task AppBundles_GetAllAlias()
7777
{
7878
using (Fixture.StartTestScope())
7979
{
@@ -86,7 +86,7 @@ public async void AppBundles_GetAllAlias()
8686

8787
[Fact]
8888
[Order(Weight = 1.4)]
89-
public async void AppBundles_GetAllVersion()
89+
public async Task AppBundles_GetAllVersion()
9090
{
9191
using (Fixture.StartTestScope())
9292
{

0 commit comments

Comments
 (0)