Skip to content

Commit db280a0

Browse files
committed
Merge branch 'feature/UpgradeNet7' into feature/NuGetUpdate
2 parents 501134d + 66410e3 commit db280a0

File tree

81 files changed

+117
-131
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+117
-131
lines changed

.github/workflows/ci.yml

Lines changed: 22 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,10 @@ jobs:
5353
steps:
5454
- name: Checkout
5555
uses: actions/checkout@v3
56-
- name: Setup .NET 6.0 & 7.0
56+
- name: Setup .NET 7.0
5757
uses: actions/setup-dotnet@v2
5858
with:
59-
dotnet-version: |
60-
7.0.x
61-
6.0.x
59+
dotnet-version: 7.0.x
6260
- name: AssetStorage
6361
run: dotnet test -c Release src/Tests/AssetStorage/Desktop/Fusee.Tests.AssetStorage.Desktop.csproj
6462
- name: Math
@@ -88,12 +86,10 @@ jobs:
8886
steps:
8987
- name: Checkout
9088
uses: actions/checkout@v3
91-
- name: Setup .NET 6.0 & 7.0
89+
- name: Setup .NET 7.0
9290
uses: actions/setup-dotnet@v2
9391
with:
94-
dotnet-version: |
95-
7.0.x
96-
6.0.x
92+
dotnet-version: 7.0.x
9793
- name: Render image compare
9894
run: dotnet run -c Release --project src/Tests/Render/Desktop/Fusee.Tests.Render.Desktop.csproj
9995
- name: Upload artifact
@@ -102,8 +98,8 @@ jobs:
10298
with:
10399
name: Rendertests
104100
path: |
105-
bin/Release/Tests/Render/Desktop/net6.0/*.png
106-
bin/Release/Tests/Render/Desktop/net6.0/References/*.png
101+
bin/Release/Tests/Render/Desktop/net7.0/*.png
102+
bin/Release/Tests/Render/Desktop/net7.0/References/*.png
107103
108104
builddesktop:
109105
needs: [tests, rendertests]
@@ -119,12 +115,10 @@ jobs:
119115
steps:
120116
- name: Checkout
121117
uses: actions/checkout@v3
122-
- name: Setup .NET 6.0 & 7.0
118+
- name: Setup .NET 7.0
123119
uses: actions/setup-dotnet@v2
124120
with:
125-
dotnet-version: |
126-
7.0.x
127-
6.0.x
121+
dotnet-version: 7.0.x
128122
- name: Build Release-Desktop
129123
run: dotnet build -c Release-Desktop Fusee.sln
130124
- name: Upload Player-Artifact
@@ -158,16 +152,14 @@ jobs:
158152
steps:
159153
- name: Checkout
160154
uses: actions/checkout@v3
161-
- name: Setup .NET 6.0 & 7.0
155+
- name: Setup .NET 7.0
162156
uses: actions/setup-dotnet@v2
163157
with:
164-
dotnet-version: |
165-
7.0.x
166-
6.0.x
158+
dotnet-version: 7.0.x
167159
- name: Add msbuild to PATH
168160
uses: microsoft/setup-msbuild@v1.1
169161
with:
170-
vs-version: '[17.3,]'
162+
vs-version: '[17.4,]'
171163
msbuild-architecture: x64
172164
# - name: Setup dotnet macos workload
173165
# run: dotnet workload install macos
@@ -180,7 +172,7 @@ jobs:
180172
# - name: Build F.T.B.Blazorpatch
181173
# run: dotnet build -c Release src/Tools/Build/Blazorpatch/Fusee.Tools.Build.Blazorpatch.csproj
182174
# - name: Patch Blazor
183-
# run: dotnet bin/Release/Tools/Build/Blazorpatch/net6.0/Fusee.Tools.Build.Blazorpatch.dll -p bin/Release/Player/Blazor/net6.0/publish/wwwroot -t All
175+
# run: dotnet bin/Release/Tools/Build/Blazorpatch/net7.0/Fusee.Tools.Build.Blazorpatch.dll -p bin/Release/Player/Blazor/net7.0/publish/wwwroot -t All
184176
- name: Build F.E.Player.Desktop
185177
run: dotnet publish -c Release -p:PublishProfile=win-x64-release src\Engine\Player\Desktop\Fusee.Engine.Player.Desktop.csproj
186178
- name: Pack Fusee.sln NuGet
@@ -200,7 +192,7 @@ jobs:
200192
- name: Pack VSTemplate
201193
run: msbuild dis\VSTemplate\VSTemplate.sln -t:restore,build -p:Configuration=Release
202194
- name: Pack Blender Addon
203-
run: tar -c -a -f bin\Release\nuget\io_export_fus.zip -C bin\Release\Tools\CmdLine\net6.0\BlenderScripts\addons *
195+
run: tar -c -a -f bin\Release\nuget\io_export_fus.zip -C bin\Release\Tools\CmdLine\net7.0\BlenderScripts\addons *
204196
- name: Upload NuGet-Atrifacts
205197
uses: actions/upload-artifact@v3
206198
with:
@@ -224,12 +216,10 @@ jobs:
224216
steps:
225217
- name: Checkout
226218
uses: actions/checkout@v3
227-
- name: Setup .NET 6.0 & 7.0
219+
- name: Setup .NET 7.0
228220
uses: actions/setup-dotnet@v2
229221
with:
230-
dotnet-version: |
231-
7.0.x
232-
6.0.x
222+
dotnet-version: 7.0.x
233223
- name: Setup dotnet macos workload
234224
run: dotnet workload install macos
235225
- name: Build Release-Blazor
@@ -243,12 +233,12 @@ jobs:
243233
- name: Build F.T.B.Blazorpatch
244234
run: dotnet build -c Release src/Tools/Build/Blazorpatch/Fusee.Tools.Build.Blazorpatch.csproj
245235
- name: Patch Blazor
246-
run: dotnet bin/Release/Tools/Build/Blazorpatch/net6.0/Fusee.Tools.Build.Blazorpatch.dll -p bin/Release/Player/Blazor/net6.0/publish/wwwroot -t All
236+
run: dotnet bin/Release/Tools/Build/Blazorpatch/net7.0/Fusee.Tools.Build.Blazorpatch.dll -p bin/Release/Player/Blazor/net7.0/publish/wwwroot -t All
247237
- name: Upload Player-Artifact
248238
uses: actions/upload-artifact@v3
249239
with:
250240
name: fusee-blazor-${{ matrix.os }}-player
251-
path: bin/Release/Player/Blazor/net6.0/publish/
241+
path: bin/Release/Player/Blazor/net7.0/publish/
252242

253243
buildandroid:
254244
name: Build Android
@@ -263,13 +253,11 @@ jobs:
263253
- name: Add msbuild to PATH
264254
uses: microsoft/setup-msbuild@v1.1
265255
with:
266-
vs-version: '[17.0,]'
267-
- name: Setup .NET 6.0 & 7.0
256+
vs-version: '[17.4,]'
257+
- name: Setup .NET 7.0
268258
uses: actions/setup-dotnet@v2
269259
with:
270-
dotnet-version: |
271-
7.0.x
272-
6.0.x
260+
dotnet-version: 7.0.x
273261
- name: Build with MSBuild
274262
run: msbuild Fusee.sln -r -p:Configuration=Release-Android
275263

@@ -287,12 +275,10 @@ jobs:
287275
steps:
288276
- name: Checkout repository
289277
uses: actions/checkout@v3
290-
- name: Setup .NET 6.0 & 7.0
278+
- name: Setup .NET 7.0
291279
uses: actions/setup-dotnet@v2
292280
with:
293-
dotnet-version: |
294-
7.0.x
295-
6.0.x
281+
dotnet-version: 7.0.x
296282
- name: Initialize CodeQL
297283
uses: github/codeql-action/init@v2
298284
with:

BuildNuget.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ dotnet pack dis\DnTemplate\DnTemplate.csproj -c Release -o bin\Release\nuget
4141
msbuild dis\VSTemplate\VSTemplate.sln -t:restore,build -p:Configuration=Release
4242
copy /Y dis\VSTemplate\VSTemplate\bin\Release\ProjectTemplates\CSharp\1033\Fusee.Template.VS.zip bin\Release\nuget\ >nul
4343
copy /Y dis\VSTemplate\VSIX\bin\Release\Fusee.Template.VS.vsix bin\Release\nuget\ >nul
44-
tar -c -a -f bin\Release\nuget\io_export_fus.zip -C bin\Release\Tools\CmdLine\net6.0\BlenderScripts\addons *
44+
tar -c -a -f bin\Release\nuget\io_export_fus.zip -C bin\Release\Tools\CmdLine\net7.0\BlenderScripts\addons *
4545
goto END
4646

4747
:ERRORDOTNET

Examples/Complete/AdvancedUI/Core/Fusee.Examples.AdvancedUI.Core.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.1;net6.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1;net6.0;net7.0</TargetFrameworks>
55
<OutputPath>$(BaseOutputPath)\Examples\AdvancedUI\Core\</OutputPath>
66
</PropertyGroup>
77

Examples/Complete/AdvancedUI/Desktop/Fusee.Examples.AdvancedUI.Desktop.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<OutputPath>$(BaseOutputPath)\Examples\AdvancedUI\Desktop\</OutputPath>
66

77
<OutputType>Exe</OutputType>

Examples/Complete/Camera/Core/Fusee.Examples.Camera.Core.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.1;net6.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1;net6.0;net7.0</TargetFrameworks>
55
<OutputPath>$(BaseOutputPath)\Examples\Camera\Core\</OutputPath>
66
</PropertyGroup>
77

Examples/Complete/Camera/Desktop/Fusee.Examples.Camera.Desktop.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<OutputPath>$(BaseOutputPath)\Examples\Camera\Desktop\</OutputPath>
66

77
<OutputType>Exe</OutputType>

Examples/Complete/ComputeFractal/Core/Fusee.Examples.ComputeFractal.Core.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.1;net6.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1;net6.0;net7.0</TargetFrameworks>
55
<OutputPath>$(BaseOutputPath)\Examples\ComputeFractal\Core\</OutputPath>
66
</PropertyGroup>
77

Examples/Complete/ComputeFractal/Desktop/Fusee.Examples.ComputeFractal.Desktop.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<OutputPath>$(BaseOutputPath)\Examples\ComputeFractal\Desktop\</OutputPath>
66

77
<OutputType>Exe</OutputType>

Examples/Complete/Deferred/Core/Fusee.Examples.Deferred.Core.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;netstandard2.1</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1;net6.0;net7.0</TargetFrameworks>
55
<OutputPath>$(BaseOutputPath)\Examples\Deferred\Core\</OutputPath>
66
</PropertyGroup>
77

Examples/Complete/Deferred/Desktop/Fusee.Examples.Deferred.Desktop.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<OutputPath>$(BaseOutputPath)\Examples\Deferred\Desktop\</OutputPath>
66
<DefineConstants>$(DefineConstants);PLATFORM_DESKTOP</DefineConstants>
77
<OutputType>Exe</OutputType>

0 commit comments

Comments
 (0)