mirror of
https://github.com/LBPUnion/UnionPatcher.git
synced 2025-04-19 19:15:28 +00:00
Target .NET 6.0
This commit is contained in:
parent
a981a129fe
commit
2b7f83213f
7 changed files with 12 additions and 12 deletions
8
.github/workflows/build.yml
vendored
8
.github/workflows/build.yml
vendored
|
@ -14,8 +14,8 @@ jobs:
|
|||
fail-fast: false
|
||||
matrix:
|
||||
os:
|
||||
- { prettyName: Windows, configurationName: Windows, extraArgs: "-r win-x64", buildPath: "Release/net5.0-windows/win-x64/publish"}
|
||||
- { prettyName: Linux, configurationName: Linux, extraArgs: "", buildPath: "Release/net5.0/publish"}
|
||||
- { prettyName: Windows, configurationName: Windows, extraArgs: "-r win-x64", buildPath: "Release/net6.0-windows/win-x64/publish"}
|
||||
- { prettyName: Linux, configurationName: Linux, extraArgs: "", buildPath: "Release/net6.0/publish"}
|
||||
# - { prettyName: MacOS, configurationName: Release, platform: osx-x64 }
|
||||
steps:
|
||||
- name: Cancel previous runs of this workflow
|
||||
|
@ -26,10 +26,10 @@ jobs:
|
|||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Install .NET 5.0
|
||||
- name: Install .NET 6.0
|
||||
uses: actions/setup-dotnet@v1
|
||||
with:
|
||||
dotnet-version: "5.0.x"
|
||||
dotnet-version: "6.0.x"
|
||||
|
||||
- name: Compile for ${{ matrix.os.prettyName }}
|
||||
run: dotnet publish -c ${{ matrix.os.configurationName }} ${{ matrix.os.extraArgs }}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>net5.0</TargetFramework>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
<RuntimeIdentifiers>linux-x64</RuntimeIdentifiers>
|
||||
<AssemblyName>LBPUnion.UnionPatcher.Gui.Linux</AssemblyName>
|
||||
<RootNamespace>LBPUnion.UnionPatcher.Gui.Linux</RootNamespace>
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>net5.0</TargetFramework>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
<RuntimeIdentifiers>osx-x64</RuntimeIdentifiers>
|
||||
<AssemblyName>LBPUnion.UnionPatcher.Gui.MacOS</AssemblyName>
|
||||
<RootNamespace>LBPUnion.UnionPatcher.Gui.MacOS</RootNamespace>
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<TargetFramework>net5.0-windows</TargetFramework>
|
||||
<TargetFramework>net6.0-windows</TargetFramework>
|
||||
<RootNamespace>LBPUnion.UnionPatcher.Gui.Windows</RootNamespace>
|
||||
<AssemblyName>LBPUnion.UnionPatcher.Gui.Windows</AssemblyName>
|
||||
</PropertyGroup>
|
||||
|
|
|
@ -7,11 +7,11 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Configuration)' != 'Windows' ">
|
||||
<TargetFramework>net5.0</TargetFramework>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Windows' ">
|
||||
<TargetFramework>net5.0-windows</TargetFramework>
|
||||
<TargetFramework>net6.0-windows</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
|
||||
<s:String x:Key="/Default/Environment/AssemblyExplorer/XmlDocument/@EntryValue"><AssemblyExplorer>
|
||||
<Assembly Path="/home/jvyden/Documents/UnionPatcher/UnionPatcher.Gui.Windows/bin/Release/net5.0-windows/win10-x64/api-ms-win-core-file-l2-1-0.dll" />
|
||||
<Assembly Path="/home/jvyden/Documents/UnionPatcher/UnionPatcher.Gui.Windows/bin/Release/net6.0-windows/win10-x64/api-ms-win-core-file-l2-1-0.dll" />
|
||||
</AssemblyExplorer></s:String></wpf:ResourceDictionary>
|
|
@ -8,12 +8,12 @@
|
|||
|
||||
<PropertyGroup Condition=" '$(Configuration)' != 'Windows' ">
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>net5.0</TargetFramework>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Windows' ">
|
||||
<OutputType>WinExe</OutputType>
|
||||
<TargetFramework>net5.0-windows</TargetFramework>
|
||||
<TargetFramework>net6.0-windows</TargetFramework>
|
||||
<AssemblyName>LBPUnion.UnionPatcher</AssemblyName>
|
||||
<RootNamespace>LBPUnion.UnionPatcher</RootNamespace>
|
||||
<SelfContained>true</SelfContained>
|
||||
|
|
Loading…
Add table
Reference in a new issue