Skip to content

Commit 85409de

Browse files
Happypig375Happypig375
authored
Update everything to net10.0
1 parent da56240 commit 85409de

File tree

31 files changed

+77
-175
lines changed

31 files changed

+77
-175
lines changed

‎.github/workflows/Benchmark.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ jobs:
1212
Benchmark:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout
1616

17-
- name: Setup .NET 7
18-
uses: actions/setup-dotnet@v1
17+
- name: Setup .NET 10
18+
uses: actions/setup-dotnet
1919
with:
20-
dotnet-version: '7.0.x'
20+
dotnet-version: '10.x'
2121
include-prerelease: true
2222

2323
- name: 'Inter version CPU benchmark'

‎.github/workflows/CPPBuild.yml‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,12 @@ jobs:
2424
runs-on: ${{ matrix.os }}
2525

2626
steps:
27-
- uses: actions/checkout@v2
27+
- uses: actions/checkout
2828

29-
- name: Setup .NET 5
30-
uses: actions/setup-dotnet@v1
29+
- name: Setup .NET 10
30+
uses: actions/setup-dotnet
3131
with:
32-
dotnet-version: '5.0.x'
33-
34-
- name: Setup .NET 7
35-
uses: actions/setup-dotnet@v1
36-
with:
37-
dotnet-version: '7.0.100'
38-
include-prerelease: true
32+
dotnet-version: '10.x'
3933

4034
- name: 'Generating exports'
4135
run: |
@@ -54,7 +48,7 @@ jobs:
5448
run: |
5549
cd Sources/Wrappers/AngouriMath.CPP.Exporting
5650
mkdir ../AngouriMath.CPP.Importing/out-x64
57-
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
51+
call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
5852
dotnet publish -p:NativeLib=Shared -p:SelfContained=true -r ${{ matrix.flag }} -c release
5953
6054
- name: 'Building the library into native for Linux & MacOS'
@@ -63,8 +57,7 @@ jobs:
6357
cd Sources/Wrappers/AngouriMath.CPP.Exporting
6458
mkdir ../AngouriMath.CPP.Importing/out-x64
6559
dotnet publish -p:NativeLib=Shared -p:SelfContained=true -r ${{ matrix.flag }} -c release
66-
67-
60+
6861
- name: 'Renaming the library for Linux'
6962
if: ${{ matrix.os == 'ubuntu-latest' }}
7063
run: |
@@ -77,10 +70,9 @@ jobs:
7770
cd Sources/Wrappers/AngouriMath.CPP.Importing/out-x64
7871
mv AngouriMath.CPP.Exporting.dylib libAngouriMath.CPP.Exporting.dylib
7972
install_name_tool -id "@rpath/libAngouriMath.CPP.Exporting.dylib" libAngouriMath.CPP.Exporting.dylib
80-
8173
8274
- name: 'Uploading artifacts'
83-
uses: actions/upload-artifact@v2
75+
uses: actions/upload-artifact
8476
with:
8577
name: AngouriMath.CPP-${{ matrix.os }}-x64
8678
path: ./Sources/Wrappers/AngouriMath.CPP.Importing

‎.github/workflows/CPPTest.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ on:
88
branches:
99
- '*'
1010

11-
1211
env:
1312
tests_path: Sources/Tests/CPPWrapperUnitTests/tests
1413

@@ -27,12 +26,12 @@ jobs:
2726
runs-on: ${{ matrix.os }}
2827

2928
steps:
30-
- uses: actions/checkout@v2
29+
- uses: actions/checkout
3130

32-
- name: Setup .NET 7
33-
uses: actions/setup-dotnet@v1
31+
- name: Setup .NET 10
32+
uses: actions/setup-dotnet
3433
with:
35-
dotnet-version: '7.0.100'
34+
dotnet-version: '10.x'
3635
include-prerelease: true
3736

3837
- name: 'Install some libs for Linux'
@@ -93,7 +92,7 @@ jobs:
9392
9493
- name: 'Upload logs'
9594
if: failure()
96-
uses: actions/upload-artifact@v2
95+
uses: actions/upload-artifact
9796
with:
9897
name: Logs
9998
path: ./Sources/Tests/CPPWrapperUnitTests/tests/build/Testing/Temporary

‎.github/workflows/CSharpBuild.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ jobs:
1515
matrix:
1616
os: [windows-latest, ubuntu-latest, macos-latest]
1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout
1919
with:
2020
submodules: 'recursive'
21-
- name: Setup .NET 7
22-
uses: actions/setup-dotnet@v1
21+
- name: Setup .NET 10
22+
uses: actions/setup-dotnet
2323
with:
24-
dotnet-version: '7.0.100'
24+
dotnet-version: '10.x'
2525
include-prerelease: true
2626

2727
- name: Build AngouriMath

‎.github/workflows/CSharpTest.yml‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,14 @@ jobs:
1717
runs-on: ${{ matrix.os }}
1818

1919
steps:
20-
- uses: actions/checkout@v2
20+
- uses: actions/checkout
2121
with:
2222
submodules: 'recursive'
2323

24-
25-
- name: Setup .NET Core 3
26-
uses: actions/setup-dotnet@v1
24+
- name: Setup .NET 10
25+
uses: actions/setup-dotnet
2726
with:
28-
dotnet-version: 3.1.202
29-
30-
- name: Setup .NET Core 5
31-
uses: actions/setup-dotnet@v1
32-
with:
33-
dotnet-version: 5.0.202
34-
35-
- name: Setup .NET 7 # The dotnet CLI above is replaced by this but the runtime is kept
36-
uses: actions/setup-dotnet@v1
37-
with:
38-
dotnet-version: '7.0.100'
27+
dotnet-version: '10.x'
3928
include-prerelease: true
4029

4130
- name: Build Tests # We need it to be able to retry
@@ -62,14 +51,14 @@ jobs:
6251

6352
- name: 'Upload report as artifact'
6453
if: ${{ matrix.os == 'windows-latest' }}
65-
uses: actions/upload-artifact@v2
54+
uses: actions/upload-artifact
6655
with:
6756
name: Report
6857
path: ./Sources/Tests/UnitTests/coverage.opencover.xml
6958
retention-days: 3
7059

7160
- name: 'Send to codecov'
7261
if: ${{ matrix.os == 'windows-latest' }}
73-
uses: codecov/codecov-action@v1
62+
uses: codecov/codecov-action
7463
with:
7564
file: ./Sources/Tests/UnitTests/coverage.opencover.xml

‎.github/workflows/EverythingBuild.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
with:
1818
submodules: 'recursive'
1919

20-
- name: Setup .NET 7
21-
uses: actions/setup-dotnet@v1
20+
- name: Setup .NET 10
21+
uses: actions/setup-dotnet
2222
with:
23-
dotnet-version: '7.0.x'
23+
dotnet-version: '10.x'
2424
include-prerelease: true
2525

2626
- name: Build AM

‎.github/workflows/FSharpBuild.yml‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,14 @@ jobs:
1717
runs-on: ${{ matrix.os }}
1818

1919
steps:
20-
- uses: actions/checkout@v2
20+
- uses: actions/checkout
2121
with:
2222
submodules: 'recursive'
2323

24-
- name: Setup .NET Core 3.1
25-
uses: actions/setup-dotnet@v1
24+
- name: Setup .NET 10
25+
uses: actions/setup-dotnet
2626
with:
27-
dotnet-version: 3.1.302
28-
29-
- name: Setup .NET 7 # The dotnet CLI above is replaced by this but the runtime is kept
30-
uses: actions/setup-dotnet@v1
31-
with:
32-
dotnet-version: '7.0.x'
27+
dotnet-version: '10.x'
3328
include-prerelease: true
3429

3530
- name: Build

‎.github/workflows/FSharpTest.yml‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,14 @@ jobs:
1717
runs-on: ${{ matrix.os }}
1818

1919
steps:
20-
- uses: actions/checkout@v2
20+
- uses: actions/checkout
2121
with:
2222
submodules: 'recursive'
2323

24-
- name: Setup .NET
25-
uses: actions/setup-dotnet@v1
24+
- name: Setup .NET 10
25+
uses: actions/setup-dotnet
2626
with:
27-
dotnet-version: 5.0.202
28-
29-
- name: Setup .NET 7
30-
uses: actions/setup-dotnet@v1
31-
with:
32-
dotnet-version: '7.0.x'
27+
dotnet-version: '10.x'
3328
include-prerelease: true
3429

3530
- name: Build Tests # We need it to be able to retry

‎.github/workflows/IntegrationTest.yml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@ env:
1515
library_version: 33.33.33
1616
library_packed_path: D:\a\AngouriMath\AngouriMath\testlib\bin\release
1717

18-
1918
jobs:
2019
ConsoleApp:
2120
runs-on: windows-latest
2221
steps:
23-
- uses: actions/checkout@v2
24-
- uses: actions/setup-dotnet@v1
22+
- uses: actions/checkout
23+
- uses: actions/setup-dotnet
2524
with:
26-
dotnet-version: '7.0.x'
25+
dotnet-version: '10.x'
2726
include-prerelease: true
2827

2928
- name: 'Pack AngouriMath'
@@ -62,10 +61,10 @@ jobs:
6261
ClassLibConsoleApp:
6362
runs-on: windows-latest
6463
steps:
65-
- uses: actions/checkout@v2
66-
- uses: actions/setup-dotnet@v1
64+
- uses: actions/checkout
65+
- uses: actions/setup-dotnet
6766
with:
68-
dotnet-version: '7.0.x'
67+
dotnet-version: '10.x'
6968
include-prerelease: true
7069

7170
- name: 'Pack AngouriMath'
@@ -96,7 +95,7 @@ jobs:
9695
9796
- name: 'Create console app'
9897
run: |
99-
dotnet new console --name testconsole --framework net7.0
98+
dotnet new console --name testconsole --framework net10.0
10099
cd testconsole
101100
"using TestLib; TestType.TestMethod();" | Out-File -FilePath Program.cs
102101

‎.github/workflows/InteractiveBuild.yml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,10 @@ jobs:
2121
with:
2222
submodules: 'recursive'
2323

24-
- name: Setup .NET Core 3.1
25-
uses: actions/setup-dotnet@v1
24+
- name: Setup .NET 10
25+
uses: actions/setup-dotnet
2626
with:
27-
dotnet-version: 3.1.302
28-
29-
- name: Setup .NET 7 # The dotnet CLI above is replaced by this but the runtime is kept
30-
uses: actions/setup-dotnet@v1
31-
with:
32-
dotnet-version: '7.0.x'
27+
dotnet-version: '10.x'
3328
include-prerelease: true
3429

3530
- name: Build

0 commit comments

Comments
 (0)