Skip to content

Commit 1374b84

Browse files
committed
Revert "Upgrade to .NET 6"
This reverts commit e95e16f.
1 parent 5878dc8 commit 1374b84

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

.github/workflows/dotnet.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup .NET
1919
uses: actions/setup-dotnet@v1
2020
with:
21-
dotnet-version: 6.0.x
21+
dotnet-version: 5.0.x
2222

2323
- name: Restore dependencies
2424
run: dotnet restore
@@ -51,23 +51,23 @@ jobs:
5151
- name: Publish Command Line Tool for macOS
5252
if: ${{ runner.os == 'macOS' }}
5353
run: |
54-
dotnet publish YukimiScript.CommandLineTool/YukimiScript.CommandLineTool.fsproj -c Release -r osx-x64 --self-contained
55-
strip ${{ github.workspace }}/YukimiScript.CommandLineTool/bin/Release/net6.0/osx-x64/publish/ykmc
54+
dotnet publish YukimiScript.CommandLineTool/YukimiScript.CommandLineTool.AOT.fsproj -c Release -r osx-x64
55+
strip ${{ github.workspace }}/YukimiScript.CommandLineTool/bin/Release/net5.0/osx-x64/publish/ykmc
5656
5757
- name: Publish Command Line Tool for Linux
5858
if: ${{ runner.os == 'Linux' }}
5959
run: |
60-
dotnet publish YukimiScript.CommandLineTool/YukimiScript.CommandLineTool.fsproj -c Release -r linux-x64 -p:PublishSingleFile=true -p:PublishTrimmed=true --self-contained
61-
mv ${{ github.workspace }}/YukimiScript.CommandLineTool/bin/Release/net6.0/linux-x64/publish/YukimiScript.CommandLineTool ${{ github.workspace }}/YukimiScript.CommandLineTool/bin/Release/net6.0/linux-x64/publish/ykmc
62-
strip ${{ github.workspace }}/YukimiScript.CommandLineTool/bin/Release/net6.0/linux-x64/publish/ykmc
60+
dotnet publish YukimiScript.CommandLineTool/YukimiScript.CommandLineTool.fsproj -c Release -r linux-x64 -p:PublishSingleFile=true -p:PublishTrimmed=true
61+
mv ${{ github.workspace }}/YukimiScript.CommandLineTool/bin/Release/net5.0/linux-x64/publish/YukimiScript.CommandLineTool ${{ github.workspace }}/YukimiScript.CommandLineTool/bin/Release/net5.0/linux-x64/publish/ykmc
62+
strip ${{ github.workspace }}/YukimiScript.CommandLineTool/bin/Release/net5.0/linux-x64/publish/ykmc
6363
6464
- name: Test Executable File for Windows
6565
if: ${{ runner.os == 'Windows' }}
66-
run: ${{ github.workspace }}/YukimiScript.CommandLineTool/bin/Release/net6.0/win7-x64/publish/ykmc.exe
66+
run: ${{ github.workspace }}/YukimiScript.CommandLineTool/bin/Release/net5.0/win7-x64/publish/ykmc.exe
6767

6868
- name: Test Executable File for macOS
6969
if: ${{ runner.os == 'macOS' }}
70-
run: ${{ github.workspace }}/YukimiScript.CommandLineTool/bin/Release/net6.0/osx-x64/publish/ykmc
70+
run: ${{ github.workspace }}/YukimiScript.CommandLineTool/bin/Release/net5.0/osx-x64/publish/ykmc
7171

7272
- name: Upload Command Line Tool for DotNetTool
7373
uses: actions/[email protected]
@@ -80,19 +80,19 @@ jobs:
8080
uses: actions/[email protected]
8181
with:
8282
name: YukimiScript Command Line Tool for Windows x64
83-
path: ${{ github.workspace }}/YukimiScript.CommandLineTool/bin/Release/net6.0/win7-x64/publish/ykmc.exe
83+
path: ${{ github.workspace }}/YukimiScript.CommandLineTool/bin/Release/net5.0/win7-x64/publish/ykmc.exe
8484
if: ${{ runner.os == 'Windows' }}
8585

8686
- name: Upload Command Line Tool for macOS
8787
uses: actions/[email protected]
8888
with:
8989
name: YukimiScript Command Line Tool for macOS x64
90-
path: ${{ github.workspace }}/YukimiScript.CommandLineTool/bin/Release/net6.0/osx-x64/publish/ykmc
90+
path: ${{ github.workspace }}/YukimiScript.CommandLineTool/bin/Release/net5.0/osx-x64/publish/ykmc
9191
if: ${{ runner.os == 'macOS' }}
9292

9393
- name: Upload Command Line Tool for Linux
9494
uses: actions/[email protected]
9595
with:
9696
name: YukimiScript Command Line Tool for Linux x64
97-
path: ${{ github.workspace }}/YukimiScript.CommandLineTool/bin/Release/net6.0/linux-x64/publish/ykmc
97+
path: ${{ github.workspace }}/YukimiScript.CommandLineTool/bin/Release/net5.0/linux-x64/publish/ykmc
9898
if: ${{ runner.os == 'Linux' }}

YukimiScript.CodeGen.Lua/YukimiScript.CodeGen.Lua.fsproj

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>netstandard2.0</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<WarnOn>3390;$(WarnOn)</WarnOn>
77
</PropertyGroup>

YukimiScript.CommandLineTool/YukimiScript.CommandLineTool.AOT.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net5.0</TargetFramework>
66
<WarnOn>3390;$(WarnOn)</WarnOn>
77
<AssemblyName>ykmc</AssemblyName>
88
</PropertyGroup>

YukimiScript.CommandLineTool/YukimiScript.CommandLineTool.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net5.0</TargetFramework>
66
<WarnOn>3390;$(WarnOn)</WarnOn>
77
<PackAsTool>true</PackAsTool>
88
<ToolCommandName>ykmc</ToolCommandName>

YukimiScript.Parser.Test/YukimiScript.Parser.Test.fsproj

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>net5.0</TargetFramework>
55

66
<OutputType>Library</OutputType>
77
<IsPackable>false</IsPackable>

0 commit comments

Comments
 (0)