Skip to content

Fixes #3484 (V1) - Updates SDK version to dotnet8, adds netstandard2.0 and net8.0 TargetFrameworks #3486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tig merged 14 commits into from
May 29, 2024
Merged

Fixes #3484 (V1) - Updates SDK version to dotnet8, adds netstandard2.0 and net8.0 TargetFrameworks #3486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3fc1878
Updated to use Nstack v1.1.1
tig Jan 22, 2024
d0d7650
Merge branch 'develop' of tig:gui-cs/Terminal.Gui into develop
tig Jan 22, 2024
5f6e58c
Merge branch 'develop' of tig:tig/Terminal.Gui into develop
tig Feb 21, 2024
7021509
Merge branch 'develop' of github.com:gui-cs/Terminal.Gui into develop
tig Feb 22, 2024
cbf3785
Merge branch 'develop' of tig:tig/Terminal.Gui into develop
tig Feb 28, 2024
a3d984a
Merge branch 'develop' of tig:gui-cs/Terminal.Gui into develop
tig May 20, 2024
3dc5583
Updated to support dotnet8
tig May 20, 2024
736a96d
readded net7.0
tig May 21, 2024
ffd875c
added netstandard2.0
tig May 21, 2024
b4b7db3
Updates nuget
tig May 21, 2024
1e3a9b2
Rebased
tig May 29, 2024
17eb63e
Merge branch 'develop' of github.com:gui-cs/Terminal.Gui into develop
tig May 29, 2024
bf9845e
Updated nuget packages
tig May 29, 2024
5f3898d
Updated nuget packages
tig May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Terminal.Gui/Core/Clipboard/Clipboard.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ public static ustring Contents {
Application.Driver.Clipboard.SetClipboardData (value.ToString ());
}
contents = value;
} catch (NotSupportedException e) {
throw e;
} catch (NotSupportedException) {
throw;
} catch (Exception) {
contents = value;
}
Expand Down
2 changes: 1 addition & 1 deletion Terminal.Gui/Terminal.Gui.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<DebugType>portable</DebugType>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworks>net472;netstandard2.1;net7.0</TargetFrameworks>
<TargetFrameworks>net472;netstandard2.0;netstandard2.1;net7.0;net8.0</TargetFrameworks>
<RootNamespace>Terminal.Gui</RootNamespace>
<AssemblyName>Terminal.Gui</AssemblyName>
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
Expand Down
4 changes: 2 additions & 2 deletions UICatalog/UICatalog.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>9.0</LangVersion>
<StartupObject>UICatalog.UICatalogApp</StartupObject>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
Expand All @@ -22,7 +22,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.4" />
<PackageReference Include="CsvHelper" Version="32.0.2" />
<PackageReference Include="CsvHelper" Version="32.0.3" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
</ItemGroup>
<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions UnitTests/UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<!-- https://stackoverflow.com/questions/294216/why-does-c-sharp-forbid-generic-attribute-types -->
<!-- for AutoInitShutdown attribute -->
<LangVersion>Preview</LangVersion>
Expand All @@ -19,10 +19,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="ReportGenerator" Version="5.2.5" />
<PackageReference Include="ReportGenerator" Version="5.3.4" />
<PackageReference Include="System.Collections" Version="4.3.0" />
<PackageReference Include="xunit" Version="2.8.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
<PackageReference Include="xunit" Version="2.8.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk":{
"version":"7.0.200",
"version":"8.0.204",
"rollForward":"latestMinor"
}
}