Skip to content

Commit 8151dae

Browse files
szilvaaszilvaa
authored
Update to dotnet8 (#164)
1 parent 3a15fad commit 8151dae

File tree

14 files changed

+74
-80
lines changed

14 files changed

+74
-80
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

‎Autodesk.Forge.sln‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.28307.106
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.10.34928.147
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Autodesk.Forge.Core", "src\Autodesk.Forge.Core\Autodesk.Forge.Core.csproj", "{E59655EF-C1BF-4318-B344-B2C6B67E1A74}"
77
EndProject

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
### 4.0.0.0
2+
3+
* Migrate to .Net 8
4+
15
### 3.0.0.0
26

37
* Migrate to .Net 6

‎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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88

99
### Requirements
1010

11-
- .NET 6 or later
11+
- .NET 8 or later
1212

1313
### Dependencies
1414

15-
- [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) 13.0.1 or later
16-
- [Polly](https://github.com/App-vNext/Polly) 7.2.3 or later
15+
- [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json)
16+
- [Polly](https://github.com/App-vNext/Polly)
1717

1818
### Changelog
1919

‎src/Autodesk.Forge.Core.E2eTestHelpers/Autodesk.Forge.Core.E2eTestHelpers.csproj‎

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

33
<PropertyGroup>
4-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
5-
<Authors>Autodesk Forge Team</Authors>
6-
<Company>Autodesk</Company>
7-
<Product>Autodesk Forge</Product>
84
<Description>Shared code for Forge client sdks e2e tests</Description>
9-
<Copyright>Autodesk Inc.</Copyright>
10-
<Version>3.0.1</Version>
11-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
12-
<PackageProjectUrl>https://github.com/Autodesk-Forge/forge-api-dotnet-core</PackageProjectUrl>
13-
<PackageIcon>logo_forge-2-line.png</PackageIcon>
14-
<PackageReleaseNotes>For full release notes see https://github.com/Autodesk-Forge/forge-api-dotnet-core/blob/master/CHANGELOG.md</PackageReleaseNotes>
5+
<PackageVersion>4.0.0</PackageVersion>
6+
<IsTestProject>false</IsTestProject>
7+
<NoWarn>NU5100</NoWarn>
158
</PropertyGroup>
169

1710
<ItemGroup>
18-
<None Include="..\..\images\logo_forge-2-line.png" Pack="true" PackagePath="\" />
19-
</ItemGroup>
20-
21-
<ItemGroup>
22-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
2312
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
24-
<PackageReference Include="xunit.assert" Version="2.6.4" />
25-
<PackageReference Include="xunit.core" Version="2.6.6" />
26-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
13+
<PackageReference Include="xunit.assert" Version="2.8.1" />
14+
<PackageReference Include="xunit.core" Version="2.8.1" />
15+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
2716
<PrivateAssets>all</PrivateAssets>
2817
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2918
</PackageReference>
3019
</ItemGroup>
31-
<PropertyGroup>
32-
<IsTestProject>false</IsTestProject>
33-
</PropertyGroup>
3420

35-
<Import Project="../../nuget.targets" />
3621
</Project>

‎src/Autodesk.Forge.Core/Autodesk.Forge.Core.csproj‎

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
2+
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>
9-
<Description>Shared code for Forge client sdks</Description>
10-
<Copyright>Autodesk Inc.</Copyright>
11-
<Version>3.0.2</Version>
12-
<AssemblyVersion>3.0.2.0</AssemblyVersion>
13-
<FileVersion>3.0.2.0</FileVersion>
14-
<PackageId>Autodesk.Forge.Core</PackageId>
15-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
16-
<PackageProjectUrl>https://github.com/Autodesk-Forge/forge-api-dotnet-core</PackageProjectUrl>
17-
<PackageIcon>logo_forge-2-line.png</PackageIcon>
18-
<PackageReleaseNotes>For full release notes see https://github.com/Autodesk-Forge/forge-api-dotnet-core/blob/master/CHANGELOG.md</PackageReleaseNotes>
4+
<Description>Shared code for APS client sdks</Description>
5+
<PackageVersion>4.0.0</PackageVersion>
196
</PropertyGroup>
207

21-
<ItemGroup>
22-
<None Include="..\..\images\logo_forge-2-line.png" Pack="true" PackagePath="\" />
23-
</ItemGroup>
24-
258
<ItemGroup>
269
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
2710
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
2811
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
29-
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
30-
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
31-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
12+
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
13+
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
14+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
3215
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
33-
<PackageReference Include="Polly" Version="8.2.1" />
16+
<PackageReference Include="Polly" Version="8.4.0" />
3417
</ItemGroup>
3518

36-
<Import Project="../../nuget.targets" />
3719
</Project>

‎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: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
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"
8+
<Exec Command="dotnet nuget push @(NuGetPackOutput->WithMetadataValue('Extension','.nupkg')) -k=$(NugetApiKey) -s nuget.org"
89
IgnoreExitCode="true"
910
ContinueOnError="true"/>
1011
</Target>

0 commit comments

Comments
 (0)