Union/UnionPatcher
1
0
Fork 0
mirror of https://github.com/LBPUnion/UnionPatcher.git synced 2025-08-03 14:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Target .NET 6.0

Browse source
This commit is contained in:
jvyden 2021-11-29 20:43:20 -05:00
commit 2b7f83213f
No known key found for this signature in database
GPG key ID: 18BCF2BE0262B278
7 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/build.yml vendored
View file

@ -14,8 +14,8 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
os: os:
- { prettyName: Windows, configurationName: Windows, extraArgs: "-r win-x64", buildPath: "Release/net5.0-windows/win-x64/publish"} - { prettyName: Windows, configurationName: Windows, extraArgs: "-r win-x64", buildPath: "Release/net6.0-windows/win-x64/publish"}
- { prettyName: Linux, configurationName: Linux, extraArgs: "", buildPath: "Release/net5.0/publish"} - { prettyName: Linux, configurationName: Linux, extraArgs: "", buildPath: "Release/net6.0/publish"}
# - { prettyName: MacOS, configurationName: Release, platform: osx-x64 } # - { prettyName: MacOS, configurationName: Release, platform: osx-x64 }
steps: steps:
- name: Cancel previous runs of this workflow - name: Cancel previous runs of this workflow
@ -26,10 +26,10 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Install .NET 5.0 - name: Install .NET 6.0
uses: actions/setup-dotnet@v1 uses: actions/setup-dotnet@v1
with: with:
dotnet-version: "5.0.x" dotnet-version: "6.0.x"
- name: Compile for ${{ matrix.os.prettyName }} - name: Compile for ${{ matrix.os.prettyName }}
run: dotnet publish -c ${{ matrix.os.configurationName }} ${{ matrix.os.extraArgs }} run: dotnet publish -c ${{ matrix.os.configurationName }} ${{ matrix.os.extraArgs }}

2
UnionPatcher.Gui.Linux/UnionPatcher.Gui.Linux.csproj
View file

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<RuntimeIdentifiers>linux-x64</RuntimeIdentifiers> <RuntimeIdentifiers>linux-x64</RuntimeIdentifiers>
<AssemblyName>LBPUnion.UnionPatcher.Gui.Linux</AssemblyName> <AssemblyName>LBPUnion.UnionPatcher.Gui.Linux</AssemblyName>
<RootNamespace>LBPUnion.UnionPatcher.Gui.Linux</RootNamespace> <RootNamespace>LBPUnion.UnionPatcher.Gui.Linux</RootNamespace>

2
UnionPatcher.Gui.MacOS/UnionPatcher.Gui.MacOS.csproj
View file

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<RuntimeIdentifiers>osx-x64</RuntimeIdentifiers> <RuntimeIdentifiers>osx-x64</RuntimeIdentifiers>
<AssemblyName>LBPUnion.UnionPatcher.Gui.MacOS</AssemblyName> <AssemblyName>LBPUnion.UnionPatcher.Gui.MacOS</AssemblyName>
<RootNamespace>LBPUnion.UnionPatcher.Gui.MacOS</RootNamespace> <RootNamespace>LBPUnion.UnionPatcher.Gui.MacOS</RootNamespace>

2
UnionPatcher.Gui.Windows/UnionPatcher.Gui.Windows.csproj
View file

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<TargetFramework>net5.0-windows</TargetFramework> <TargetFramework>net6.0-windows</TargetFramework>
<RootNamespace>LBPUnion.UnionPatcher.Gui.Windows</RootNamespace> <RootNamespace>LBPUnion.UnionPatcher.Gui.Windows</RootNamespace>
<AssemblyName>LBPUnion.UnionPatcher.Gui.Windows</AssemblyName> <AssemblyName>LBPUnion.UnionPatcher.Gui.Windows</AssemblyName>
</PropertyGroup> </PropertyGroup>

4
UnionPatcher.Gui/UnionPatcher.Gui.csproj
View file

@ -7,11 +7,11 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' != 'Windows' "> <PropertyGroup Condition=" '$(Configuration)' != 'Windows' ">
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Windows' "> <PropertyGroup Condition=" '$(Configuration)' == 'Windows' ">
<TargetFramework>net5.0-windows</TargetFramework> <TargetFramework>net6.0-windows</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
UnionPatcher.sln.DotSettings.user
View file

@ -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"> <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">&lt;AssemblyExplorer&gt; <s:String x:Key="/Default/Environment/AssemblyExplorer/XmlDocument/@EntryValue">&lt;AssemblyExplorer&gt;
&lt;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" /&gt; &lt;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" /&gt;
&lt;/AssemblyExplorer&gt;</s:String></wpf:ResourceDictionary> &lt;/AssemblyExplorer&gt;</s:String></wpf:ResourceDictionary>

4
UnionPatcher/UnionPatcher.csproj
View file

@ -8,12 +8,12 @@
<PropertyGroup Condition=" '$(Configuration)' != 'Windows' "> <PropertyGroup Condition=" '$(Configuration)' != 'Windows' ">
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Windows' "> <PropertyGroup Condition=" '$(Configuration)' == 'Windows' ">
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<TargetFramework>net5.0-windows</TargetFramework> <TargetFramework>net6.0-windows</TargetFramework>
<AssemblyName>LBPUnion.UnionPatcher</AssemblyName> <AssemblyName>LBPUnion.UnionPatcher</AssemblyName>
<RootNamespace>LBPUnion.UnionPatcher</RootNamespace> <RootNamespace>LBPUnion.UnionPatcher</RootNamespace>
<SelfContained>true</SelfContained> <SelfContained>true</SelfContained>