Skip to content
This repository has been archived by the owner on Jul 12, 2024. It is now read-only.

Merge develop into main #49

Merged
merged 2 commits into from
May 15, 2023
+2,426 −2,429
Merged

Merge develop into main #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bd8508
Target .NET 7
ArachisH May 15, 2023
3e3e0a0
Flipped the json files as the messages were not in their correct file
ArachisH May 15, 2023
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
5 changes: 1 addition & 4 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,4 @@ paket-files/

# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc

/Sulakore.Sandbox
/.github/workflows/dotnet.yml.bak
*.pyc
4 changes: 2 additions & 2 deletions Sulakore.Tests/Sulakore.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<IsPackable>false</IsPackable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Sulakore/Sulakore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<LangVersion>preview</LangVersion>
<LangVersion>latest</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>

<IsTrimmable>true</IsTrimmable>
<TrimmerSingleWarn>false</TrimmerSingleWarn>
Expand Down
Loading
Loading