소스 검색

Upgrading to Net6.0 (#1515)

BDisp 3 년 전
부모
커밋
1b3668ca70

+ 1 - 1
.devcontainer/devcontainer.json

@@ -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"
 	},

+ 1 - 1
.github/workflows/dotnet-core.yml

@@ -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

+ 1 - 1
.github/workflows/publish.yml

@@ -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: |

+ 1 - 1
Example/Example.csproj

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

+ 1 - 1
FSharpExample/FSharpExample.fsproj

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

+ 4 - 7
ReactiveExample/ReactiveExample.csproj

@@ -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" />

+ 1 - 1
StandaloneExample/StandaloneExample.csproj

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

+ 1 - 1
Terminal.Gui/Terminal.Gui.csproj

@@ -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>

+ 1 - 1
UICatalog/UICatalog.csproj

@@ -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>

+ 1 - 1
UnitTests/UnitTests.csproj

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

+ 1 - 1
global.json

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