Upgrading to Net6.0 (#1515)

This commit is contained in:
BDisp
2021-12-18 13:26:00 +00:00
committed by GitHub
parent 024ce57430
commit 1b3668ca70
11 changed files with 14 additions and 17 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "Terminal.Gui Codespace",
"image": "mcr.microsoft.com/vscode/devcontainers/dotnet:5.0",
"image": "mcr.microsoft.com/vscode/devcontainers/dotnet:6.0",
"settings": {
"terminal.integrated.defaultProfile.linux": "pwsh"
},

View File

@@ -17,7 +17,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.100
dotnet-version: 6.0.100
- name: Install dependencies
run: dotnet restore

View File

@@ -18,7 +18,7 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.100
dotnet-version: 6.0.100
- name: minver-cli
run: |

View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

View File

@@ -1,15 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ReactiveUI.Fody" Version="14.2.1" />
<PackageReference Include="ReactiveUI" Version="14.2.1" />
<PackageReference
Include="ReactiveMarbles.ObservableEvents.SourceGenerator"
Version="1.1.4"
PrivateAssets="all" />
<PackageReference Include="ReactiveUI.Fody" Version="16.3.10" />
<PackageReference Include="ReactiveUI" Version="16.3.10" />
<PackageReference Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.1.4" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Terminal.Gui\Terminal.Gui.csproj" />

View File

@@ -3,7 +3,7 @@
<PropertyGroup>
<LangVersion>latest</LangVersion>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

View File

@@ -25,7 +25,7 @@
<!-- This enables prefixing version tags with v, e.g. v1.0.0 Instead of 1.0.0 -->
<MinVerTagPrefix>v</MinVerTagPrefix>
<TargetFrameworks>net472;netstandard2.0;net5.0</TargetFrameworks>
<TargetFrameworks>net472;netstandard2.0;net6.0</TargetFrameworks>
<RootNamespace>Terminal.Gui</RootNamespace>
<AssemblyName>Terminal.Gui</AssemblyName>
<DocumentationFile>bin\Release\Terminal.Gui.xml</DocumentationFile>

View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<StartupObject>UICatalog.UICatalogApp</StartupObject>
<AssemblyVersion>1.0.0.1</AssemblyVersion>
<LangVersion>8.0</LangVersion>

View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
<UseDataCollector />
</PropertyGroup>

View File

@@ -1,6 +1,6 @@
{
"sdk":{
"version":"5.0.100",
"version":"6.0.100",
"rollForward":"latestMajor"
}
}