Skip to content

Commit

Permalink
Merge project
Browse files Browse the repository at this point in the history
  • Loading branch information
@wieslawsoltes
wieslawsoltes committed Nov 7, 2023
1 parent 842f127 commit 3224b3d
Show file tree
Hide file tree
Showing 42 changed files with 17 additions and 779 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,5 @@ jobs:
- uses: actions/checkout@v1
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
- name: Install workload
run: dotnet workload install wasm-tools wasm-experimental android
- name: Build Release
run: dotnet build -c Release
48 changes: 0 additions & 48 deletions .github/workflows/pages.yml
View file

This file was deleted.

77 changes: 0 additions & 77 deletions Core2D.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D", "src\Core2D\Core2D
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.Generators", "src\Core2D.Generators\Core2D.Generators.csproj", "{C2E3F840-F1D4-4995-BF41-E3EE8BB3D0CA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core2D.Desktop", "src\Core2D.Desktop\Core2D.Desktop.csproj", "{0AFCF95C-41E1-4F26-8DF5-2CF112527A71}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{2054893F-E436-4482-B4D3-1BED82C2603D}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
Expand All @@ -24,10 +22,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{205489
build.sh = build.sh
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{1E03FE6F-FA1D-422E-A0C1-A06AC959E4FC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demo.Base", "samples\Demo.Base\Demo.Base.csproj", "{D1A5EC32-49CF-41A5-85F2-9796490B18FF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{33116698-64BF-46E3-A655-86981600BFAD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{1AE10EDE-F6CB-4EE3-9096-FFBBA86B0627}"
Expand All @@ -36,12 +30,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core2D.UnitTests", "tests\C
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_build", "build\build\_build.csproj", "{C43260E6-62B6-415F-9301-ED34DA1816D7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core2D.Web", "src\Core2D.Web\Core2D.Web.csproj", "{FF36305E-27AC-404C-9EE1-459FB160FA19}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demo.Desktop", "samples\Demo.Desktop\Demo.Desktop.csproj", "{79954C93-1801-44F1-BC3E-8E872FAE4782}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demo.Android", "samples\Demo.Android\Demo.Android.csproj", "{73ADEA31-55F8-467B-AD7D-DFDCDF09623A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -76,30 +64,6 @@ Global
{C2E3F840-F1D4-4995-BF41-E3EE8BB3D0CA}.Release|x64.Build.0 = Release|Any CPU
{C2E3F840-F1D4-4995-BF41-E3EE8BB3D0CA}.Release|x86.ActiveCfg = Release|Any CPU
{C2E3F840-F1D4-4995-BF41-E3EE8BB3D0CA}.Release|x86.Build.0 = Release|Any CPU
{0AFCF95C-41E1-4F26-8DF5-2CF112527A71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0AFCF95C-41E1-4F26-8DF5-2CF112527A71}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0AFCF95C-41E1-4F26-8DF5-2CF112527A71}.Debug|x64.ActiveCfg = Debug|Any CPU
{0AFCF95C-41E1-4F26-8DF5-2CF112527A71}.Debug|x64.Build.0 = Debug|Any CPU
{0AFCF95C-41E1-4F26-8DF5-2CF112527A71}.Debug|x86.ActiveCfg = Debug|Any CPU
{0AFCF95C-41E1-4F26-8DF5-2CF112527A71}.Debug|x86.Build.0 = Debug|Any CPU
{0AFCF95C-41E1-4F26-8DF5-2CF112527A71}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0AFCF95C-41E1-4F26-8DF5-2CF112527A71}.Release|Any CPU.Build.0 = Release|Any CPU
{0AFCF95C-41E1-4F26-8DF5-2CF112527A71}.Release|x64.ActiveCfg = Release|Any CPU
{0AFCF95C-41E1-4F26-8DF5-2CF112527A71}.Release|x64.Build.0 = Release|Any CPU
{0AFCF95C-41E1-4F26-8DF5-2CF112527A71}.Release|x86.ActiveCfg = Release|Any CPU
{0AFCF95C-41E1-4F26-8DF5-2CF112527A71}.Release|x86.Build.0 = Release|Any CPU
{D1A5EC32-49CF-41A5-85F2-9796490B18FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D1A5EC32-49CF-41A5-85F2-9796490B18FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D1A5EC32-49CF-41A5-85F2-9796490B18FF}.Debug|x64.ActiveCfg = Debug|Any CPU
{D1A5EC32-49CF-41A5-85F2-9796490B18FF}.Debug|x64.Build.0 = Debug|Any CPU
{D1A5EC32-49CF-41A5-85F2-9796490B18FF}.Debug|x86.ActiveCfg = Debug|Any CPU
{D1A5EC32-49CF-41A5-85F2-9796490B18FF}.Debug|x86.Build.0 = Debug|Any CPU
{D1A5EC32-49CF-41A5-85F2-9796490B18FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D1A5EC32-49CF-41A5-85F2-9796490B18FF}.Release|Any CPU.Build.0 = Release|Any CPU
{D1A5EC32-49CF-41A5-85F2-9796490B18FF}.Release|x64.ActiveCfg = Release|Any CPU
{D1A5EC32-49CF-41A5-85F2-9796490B18FF}.Release|x64.Build.0 = Release|Any CPU
{D1A5EC32-49CF-41A5-85F2-9796490B18FF}.Release|x86.ActiveCfg = Release|Any CPU
{D1A5EC32-49CF-41A5-85F2-9796490B18FF}.Release|x86.Build.0 = Release|Any CPU
{41864624-DF9B-4E24-821C-134C79C7E2B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{41864624-DF9B-4E24-821C-134C79C7E2B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{41864624-DF9B-4E24-821C-134C79C7E2B3}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand All @@ -124,56 +88,15 @@ Global
{C43260E6-62B6-415F-9301-ED34DA1816D7}.Release|x64.Build.0 = Release|Any CPU
{C43260E6-62B6-415F-9301-ED34DA1816D7}.Release|x86.ActiveCfg = Release|Any CPU
{C43260E6-62B6-415F-9301-ED34DA1816D7}.Release|x86.Build.0 = Release|Any CPU
{FF36305E-27AC-404C-9EE1-459FB160FA19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FF36305E-27AC-404C-9EE1-459FB160FA19}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FF36305E-27AC-404C-9EE1-459FB160FA19}.Debug|x64.ActiveCfg = Debug|Any CPU
{FF36305E-27AC-404C-9EE1-459FB160FA19}.Debug|x64.Build.0 = Debug|Any CPU
{FF36305E-27AC-404C-9EE1-459FB160FA19}.Debug|x86.ActiveCfg = Debug|Any CPU
{FF36305E-27AC-404C-9EE1-459FB160FA19}.Debug|x86.Build.0 = Debug|Any CPU
{FF36305E-27AC-404C-9EE1-459FB160FA19}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FF36305E-27AC-404C-9EE1-459FB160FA19}.Release|Any CPU.Build.0 = Release|Any CPU
{FF36305E-27AC-404C-9EE1-459FB160FA19}.Release|x64.ActiveCfg = Release|Any CPU
{FF36305E-27AC-404C-9EE1-459FB160FA19}.Release|x64.Build.0 = Release|Any CPU
{FF36305E-27AC-404C-9EE1-459FB160FA19}.Release|x86.ActiveCfg = Release|Any CPU
{FF36305E-27AC-404C-9EE1-459FB160FA19}.Release|x86.Build.0 = Release|Any CPU
{79954C93-1801-44F1-BC3E-8E872FAE4782}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{79954C93-1801-44F1-BC3E-8E872FAE4782}.Debug|Any CPU.Build.0 = Debug|Any CPU
{79954C93-1801-44F1-BC3E-8E872FAE4782}.Debug|x64.ActiveCfg = Debug|Any CPU
{79954C93-1801-44F1-BC3E-8E872FAE4782}.Debug|x64.Build.0 = Debug|Any CPU
{79954C93-1801-44F1-BC3E-8E872FAE4782}.Debug|x86.ActiveCfg = Debug|Any CPU
{79954C93-1801-44F1-BC3E-8E872FAE4782}.Debug|x86.Build.0 = Debug|Any CPU
{79954C93-1801-44F1-BC3E-8E872FAE4782}.Release|Any CPU.ActiveCfg = Release|Any CPU
{79954C93-1801-44F1-BC3E-8E872FAE4782}.Release|Any CPU.Build.0 = Release|Any CPU
{79954C93-1801-44F1-BC3E-8E872FAE4782}.Release|x64.ActiveCfg = Release|Any CPU
{79954C93-1801-44F1-BC3E-8E872FAE4782}.Release|x64.Build.0 = Release|Any CPU
{79954C93-1801-44F1-BC3E-8E872FAE4782}.Release|x86.ActiveCfg = Release|Any CPU
{79954C93-1801-44F1-BC3E-8E872FAE4782}.Release|x86.Build.0 = Release|Any CPU
{73ADEA31-55F8-467B-AD7D-DFDCDF09623A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{73ADEA31-55F8-467B-AD7D-DFDCDF09623A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{73ADEA31-55F8-467B-AD7D-DFDCDF09623A}.Debug|x64.ActiveCfg = Debug|Any CPU
{73ADEA31-55F8-467B-AD7D-DFDCDF09623A}.Debug|x64.Build.0 = Debug|Any CPU
{73ADEA31-55F8-467B-AD7D-DFDCDF09623A}.Debug|x86.ActiveCfg = Debug|Any CPU
{73ADEA31-55F8-467B-AD7D-DFDCDF09623A}.Debug|x86.Build.0 = Debug|Any CPU
{73ADEA31-55F8-467B-AD7D-DFDCDF09623A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{73ADEA31-55F8-467B-AD7D-DFDCDF09623A}.Release|Any CPU.Build.0 = Release|Any CPU
{73ADEA31-55F8-467B-AD7D-DFDCDF09623A}.Release|x64.ActiveCfg = Release|Any CPU
{73ADEA31-55F8-467B-AD7D-DFDCDF09623A}.Release|x64.Build.0 = Release|Any CPU
{73ADEA31-55F8-467B-AD7D-DFDCDF09623A}.Release|x86.ActiveCfg = Release|Any CPU
{73ADEA31-55F8-467B-AD7D-DFDCDF09623A}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{3F804F82-57E8-47EE-BE48-FF19462C3B97} = {A5C9C74C-A503-4375-B56A-1411181B6E5A}
{C2E3F840-F1D4-4995-BF41-E3EE8BB3D0CA} = {A5C9C74C-A503-4375-B56A-1411181B6E5A}
{D1A5EC32-49CF-41A5-85F2-9796490B18FF} = {1E03FE6F-FA1D-422E-A0C1-A06AC959E4FC}
{41864624-DF9B-4E24-821C-134C79C7E2B3} = {33116698-64BF-46E3-A655-86981600BFAD}
{C43260E6-62B6-415F-9301-ED34DA1816D7} = {1AE10EDE-F6CB-4EE3-9096-FFBBA86B0627}
{79954C93-1801-44F1-BC3E-8E872FAE4782} = {1E03FE6F-FA1D-422E-A0C1-A06AC959E4FC}
{73ADEA31-55F8-467B-AD7D-DFDCDF09623A} = {1E03FE6F-FA1D-422E-A0C1-A06AC959E4FC}
{0AFCF95C-41E1-4F26-8DF5-2CF112527A71} = {1E03FE6F-FA1D-422E-A0C1-A06AC959E4FC}
{FF36305E-27AC-404C-9EE1-459FB160FA19} = {1E03FE6F-FA1D-422E-A0C1-A06AC959E4FC}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0720A3F0-7CD3-4F9C-8DFF-858B38D44C31}
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</PropertyGroup>
<PropertyGroup>
<MicrosoftNETFrameworkReferenceAssembliesVersion>1.0.3</MicrosoftNETFrameworkReferenceAssembliesVersion>
<SystemDrawingCommonVersion>5.0.2</SystemDrawingCommonVersion>
<SystemDrawingCommonVersion>6.0.0</SystemDrawingCommonVersion>
<SystemTextJsonVersion>7.0.0</SystemTextJsonVersion>
<AutofacVersion>7.1.0</AutofacVersion>
<CommunityToolkitMvvmVersion>8.1.0</CommunityToolkitMvvmVersion>
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ variables:
BuildConfiguration: 'Release'
BuildPlatform: 'Any CPU'
PublishFramework: 'net7.0'
PublishProject: 'Core2D.Desktop'
PublishProject: 'Core2D'
PublishRuntime: ''
Workloads: 'wasm-tools wasm-experimental android'
Workloads: ''

jobs:
- template: Test-PowerShell.yml@templates
Expand Down
32 changes: 0 additions & 32 deletions samples/Demo.Android/Demo.Android.csproj
View file

This file was deleted.

Binary file removed samples/Demo.Android/Icon.png
View file
Binary file not shown.
10 changes: 0 additions & 10 deletions samples/Demo.Android/MainActivity.cs
View file

This file was deleted.

5 changes: 0 additions & 5 deletions samples/Demo.Android/Properties/AndroidManifest.xml
View file

This file was deleted.

13 changes: 0 additions & 13 deletions samples/Demo.Android/Resources/drawable/splash_screen.xml
View file

This file was deleted.

4 changes: 0 additions & 4 deletions samples/Demo.Android/Resources/values/colors.xml
View file

This file was deleted.

17 changes: 0 additions & 17 deletions samples/Demo.Android/Resources/values/styles.xml
View file

This file was deleted.

21 changes: 0 additions & 21 deletions samples/Demo.Base/App.axaml
View file

This file was deleted.

65 changes: 0 additions & 65 deletions samples/Demo.Base/App.axaml.cs
View file

This file was deleted.

Binary file removed samples/Demo.Base/Assets/Core2D.ico
View file
Binary file not shown.
20 changes: 0 additions & 20 deletions samples/Demo.Base/Demo.Base.csproj
View file

This file was deleted.

Loading

0 comments on commit 3224b3d

Please sign in to comment.