Skip to content

Commit

Permalink
Merge pull request #32 from koculu/upgrade-to-net90
Browse files Browse the repository at this point in the history
Upgrade to the net 9.0
  • Loading branch information
koculu authored Nov 14, 2024
2 parents 1b36108 + 0d43702 commit 03ef337
Show file tree
Hide file tree
Showing 6 changed files with 58 additions and 56 deletions.
47 changes: 24 additions & 23 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,35 @@ name: Build and Test

on:
push:
branches: [ "main" ]
branches: ['main']
paths-ignore:
- '*.md'
- '*.md'
pull_request:
branches: [ "main" ]
branches: ['main']
paths-ignore:
- '*.md'
- '*.md'

jobs:
build:

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
7.0.x
6.0.x
- name: Display dotnet version
run: dotnet --version
- name: Restore dependencies
working-directory: ./src
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
working-directory: ./src
- name: Test
run: dotnet test --no-build --configuration Release --verbosity normal
working-directory: ./src
- uses: actions/checkout@v3
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
9.0.x
8.0.x
7.0.x
6.0.x
- name: Display dotnet version
run: dotnet --version
- name: Restore dependencies
working-directory: ./src
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
working-directory: ./src
- name: Test
run: dotnet test --no-build --configuration Release --verbosity normal
working-directory: ./src
53 changes: 27 additions & 26 deletions .github/workflows/publish-nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,34 @@ on:
workflow_dispatch:
inputs:
name:
description: "When you press run workflow, the nuget package will be published."
default: "I understand."
description: 'When you press run workflow, the nuget package will be published.'
default: 'I understand.'
jobs:
build:

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
7.0.x
6.0.x
- name: Display dotnet version
run: dotnet --version
- name: Restore dependencies
working-directory: ./src
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
working-directory: ./src
- name: Test
run: dotnet test --no-build --configuration Release --verbosity normal
working-directory: ./src
- name: Publish the package to nuget.org
run: dotnet nuget push Topaz/bin/Release/*.nupkg -k $NUGET_AUTH_TOKEN -s https://api.nuget.org/v3/index.json
env:
NUGET_AUTH_TOKEN: ${{ secrets.NUGET_TOKEN }}
working-directory: ./src
- uses: actions/checkout@v3
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
9.0.x
8.0.x
7.0.x
6.0.x
- name: Display dotnet version
run: dotnet --version
- name: Restore dependencies
working-directory: ./src
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
working-directory: ./src
- name: Test
run: dotnet test --no-build --configuration Release --verbosity normal
working-directory: ./src
- name: Publish the package to nuget.org
run: dotnet nuget push Topaz/bin/Release/*.nupkg -k $NUGET_AUTH_TOKEN -s https://api.nuget.org/v3/index.json
env:
NUGET_AUTH_TOKEN: ${{ secrets.NUGET_TOKEN }}
working-directory: ./src
2 changes: 1 addition & 1 deletion src/Topaz.Benchmark/Topaz.Benchmark.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net9.0</TargetFrameworks>
<RootNamespace>Tenray.Topaz</RootNamespace>
<RunAnalyzersDuringBuild>False</RunAnalyzersDuringBuild>
<RunAnalyzersDuringLiveAnalysis>False</RunAnalyzersDuringLiveAnalysis>
Expand Down
4 changes: 2 additions & 2 deletions src/Topaz.Test/Topaz.Test.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net9.0</TargetFrameworks>

<IsPackable>false</IsPackable>
<RootNamespace>Tenray.Topaz</RootNamespace>
Expand All @@ -13,7 +13,7 @@
<ItemGroup>
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0-preview-20221003-04" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Topaz/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<Authors>Ahmed Yasin Koculu</Authors>
<PackageId>Topaz</PackageId>
<Title>Topaz</Title>
<ProductVersion>1.4.0.0</ProductVersion>
<Version>1.4.0.0</Version>
<ProductVersion>1.4.1.0</ProductVersion>
<Version>1.4.1.0</Version>
<Authors>Ahmed Yasin Koculu</Authors>
<AssemblyTitle>Topaz</AssemblyTitle>
<Description>Multithreaded Javascript Engine for .NET</Description>
Expand Down
4 changes: 2 additions & 2 deletions src/Topaz/Topaz.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Deterministic>true</Deterministic>
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
<NeutralLanguage>en-US</NeutralLanguage>
<TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
<TargetFrameworks>net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
<RepositoryUrl>https://github.com/koculu/topaz</RepositoryUrl>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageReadmeFile>README.md</PackageReadmeFile>
Expand Down Expand Up @@ -43,7 +43,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down

0 comments on commit 03ef337

Please sign in to comment.