Skip to content

Merge master into development #80

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

Open
Blumster wants to merge 4 commits into
base: development
Choose a base branch
from
Open

Merge master into development #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ebb82e7
General refactor to .NET 7
Blumster Feb 3, 2023
d7bf927
Update dotnet.yml
Blumster Feb 3, 2023
463fc27
Update socketing, memory management and communicator
Blumster Feb 5, 2023
54745d8
Misc
Blumster Feb 5, 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
2 changes: 1 addition & 1 deletion .github/workflows/dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.x
dotnet-version: 7.0.x
- name: Restore dependencies
run: dotnet restore
- name: Build
Expand Down
21 changes: 3 additions & 18 deletions Rasa.NET.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.31105.61
# Visual Studio Version 17
VisualStudioVersion = 17.4.33213.308
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B8E6F56E-FC5A-40E5-A0B7-38A1073647FB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rasa.Auth", "src\Rasa.Auth\Rasa.Auth.csproj", "{33A8C17A-375E-4474-B8F5-44ED7833BF79}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rasa.DBL", "src\Rasa.DBL\Rasa.DBL.csproj", "{5114F5F3-F51F-4F05-AAD2-5806AAE2B737}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rasa.Shared", "src\Rasa.Shared\Rasa.Shared.csproj", "{CC99C7B9-534F-4D7A-B6A5-A1B52D66EDE8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rasa.Utils", "src\Rasa.Utils\Rasa.Utils.csproj", "{46370C5D-4E11-4546-9DC7-D6934F506192}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rasa.Game", "src\Rasa.Game\Rasa.Game.csproj", "{EB59A12A-04D6-44B2-A414-8D25DAFD565D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rasa.Test", "src\Rasa.Test\Rasa.Test.csproj", "{42A96BBC-A86C-44F4-BD31-93685CEB773F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rasa.Communicator", "src\Rasa.Communicator\Rasa.Communicator.csproj", "{A7C35087-0201-456B-9AB3-0F8B1626075E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rasa.Communicator", "src\Rasa.Communicator\Rasa.Communicator.csproj", "{A7C35087-0201-456B-9AB3-0F8B1626075E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -52,18 +50,6 @@ Global
{5114F5F3-F51F-4F05-AAD2-5806AAE2B737}.Release|x64.Build.0 = Release|Any CPU
{5114F5F3-F51F-4F05-AAD2-5806AAE2B737}.Release|x86.ActiveCfg = Release|Any CPU
{5114F5F3-F51F-4F05-AAD2-5806AAE2B737}.Release|x86.Build.0 = Release|Any CPU
{CC99C7B9-534F-4D7A-B6A5-A1B52D66EDE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CC99C7B9-534F-4D7A-B6A5-A1B52D66EDE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CC99C7B9-534F-4D7A-B6A5-A1B52D66EDE8}.Debug|x64.ActiveCfg = Debug|Any CPU
{CC99C7B9-534F-4D7A-B6A5-A1B52D66EDE8}.Debug|x64.Build.0 = Debug|Any CPU
{CC99C7B9-534F-4D7A-B6A5-A1B52D66EDE8}.Debug|x86.ActiveCfg = Debug|Any CPU
{CC99C7B9-534F-4D7A-B6A5-A1B52D66EDE8}.Debug|x86.Build.0 = Debug|Any CPU
{CC99C7B9-534F-4D7A-B6A5-A1B52D66EDE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CC99C7B9-534F-4D7A-B6A5-A1B52D66EDE8}.Release|Any CPU.Build.0 = Release|Any CPU
{CC99C7B9-534F-4D7A-B6A5-A1B52D66EDE8}.Release|x64.ActiveCfg = Release|Any CPU
{CC99C7B9-534F-4D7A-B6A5-A1B52D66EDE8}.Release|x64.Build.0 = Release|Any CPU
{CC99C7B9-534F-4D7A-B6A5-A1B52D66EDE8}.Release|x86.ActiveCfg = Release|Any CPU
{CC99C7B9-534F-4D7A-B6A5-A1B52D66EDE8}.Release|x86.Build.0 = Release|Any CPU
{46370C5D-4E11-4546-9DC7-D6934F506192}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{46370C5D-4E11-4546-9DC7-D6934F506192}.Debug|Any CPU.Build.0 = Debug|Any CPU
{46370C5D-4E11-4546-9DC7-D6934F506192}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -119,7 +105,6 @@ Global
GlobalSection(NestedProjects) = preSolution
{33A8C17A-375E-4474-B8F5-44ED7833BF79} = {B8E6F56E-FC5A-40E5-A0B7-38A1073647FB}
{5114F5F3-F51F-4F05-AAD2-5806AAE2B737} = {B8E6F56E-FC5A-40E5-A0B7-38A1073647FB}
{CC99C7B9-534F-4D7A-B6A5-A1B52D66EDE8} = {B8E6F56E-FC5A-40E5-A0B7-38A1073647FB}
{46370C5D-4E11-4546-9DC7-D6934F506192} = {B8E6F56E-FC5A-40E5-A0B7-38A1073647FB}
{EB59A12A-04D6-44B2-A414-8D25DAFD565D} = {B8E6F56E-FC5A-40E5-A0B7-38A1073647FB}
{42A96BBC-A86C-44F4-BD31-93685CEB773F} = {B8E6F56E-FC5A-40E5-A0B7-38A1073647FB}
Expand Down
Loading