Merge pull request #30 from Geta/upgrade/cms13

Upgrade/cms13

Author: ivanmarkovic1402

.github/workflows/build.yml

@@ -7,43 +7,11 @@ on:
     types: [opened, synchronize, reopened]
 jobs:
   build:
-    name: Build and analyze
+    name: Build and test
     runs-on: windows-latest
     steps:
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          java-version: 17
-          distribution: 'zulu' # Alternative distribution options are available.
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Cache SonarQube Cloud packages
-        uses: actions/cache@v4
-        with:
-          path: ~\sonar\cache
-          key: ${{ runner.os }}-sonar
-          restore-keys: ${{ runner.os }}-sonar
-      - name: Cache SonarQube Cloud scanner
-        id: cache-sonar-scanner
-        uses: actions/cache@v4
-        with:
-          path: ${{ runner.temp }}\scanner
-          key: ${{ runner.os }}-sonar-scanner
-          restore-keys: ${{ runner.os }}-sonar-scanner
-      - name: Install SonarQube Cloud scanner
-        if: steps.cache-sonar-scanner.outputs.cache-hit != 'true'
-        shell: powershell
-        run: |
-          New-Item -Path ${{ runner.temp }}\scanner -ItemType Directory
-          dotnet tool update dotnet-sonarscanner --tool-path ${{ runner.temp }}\scanner
-      - name: Build and analyze
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        shell: powershell
-        run: |
-          ${{ runner.temp }}\scanner\dotnet-sonarscanner begin /k:"Geta_${{ github.event.repository.name }}" /o:"geta" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths=**/**/coverage.opencover.xml
-          dotnet build
-          dotnet test --filter Category!=Integration /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:CoverletOutput=coverage 
-          ${{ runner.temp }}\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
+      - name: Build
+        run: dotnet build src/Geta.Optimizely.ContentTypeIcons/Geta.Optimizely.ContentTypeIcons.csproj -c Release
+      - name: Test
+        run: dotnet test tests/Geta.Optimizely.ContentTypeIcons.Tests/Geta.Optimizely.ContentTypeIcons.Tests.csproj -c Release --no-build

.github/workflows/release.yml

@@ -18,14 +18,12 @@ jobs:
         run: |
           $version = ("${{github.ref_name}}").Remove(0, 1)
           echo "VERSION=$version" >> $env:GITHUB_ENV
-      - name: Release
-        run: |
-          echo "${env:VERSION}"
-          dotnet build --configuration Release /p:Version=${{env.VERSION}}
+      - name: Build
+        run: dotnet build src/Geta.Optimizely.ContentTypeIcons/Geta.Optimizely.ContentTypeIcons.csproj -c Release /p:Version=${{env.VERSION}}
       - name: Test
-        run: dotnet test --configuration Release /p:Version=${{env.VERSION}} --no-build
+        run: dotnet test tests/Geta.Optimizely.ContentTypeIcons.Tests/Geta.Optimizely.ContentTypeIcons.Tests.csproj -c Release /p:Version=${{env.VERSION}} --no-build
       - name: Pack
-        run: dotnet pack --configuration Release /p:Version=${{env.VERSION}} --no-build --output .
+        run: dotnet pack src/Geta.Optimizely.ContentTypeIcons/Geta.Optimizely.ContentTypeIcons.csproj -c Release /p:Version=${{env.VERSION}} --no-build --output .
       - name: Push
         run: |
           dotnet nuget push Geta.Optimizely.ContentTypeIcons.${{env.VERSION}}.nupkg --source https://nuget.pkg.github.com/Geta/index.json --api-key ${{env.GITHUB_TOKEN}}

.gitignore

@@ -1,3 +1,8 @@
+# Local development settings with credentials
+appsettings.Development.json
+.claude/
+*.nupkg
+
 # Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
 [Bb]in/
 [Oo]bj/
@@ -110,3 +115,15 @@ UpgradeLog*.XML
 License.config
 *.orig
 /.idea/
+
+# Removed sandbox (using Aspire instead)
+sandbox/
+
+# App_Data junction to Foundation submodule
+src/Geta.Optimizely.ContentTypeIcons.Web/App_Data/
+
+# CMS UI module zips (auto-extracted by MSBuild from NuGet packages)
+src/Geta.Optimizely.ContentTypeIcons.Web/modules/_protected/
+
+# Local SQL init script (run manually on fresh DB)
+src/Geta.Optimizely.ContentTypeIcons.Web/init-foundation-schema.sql

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "sub/geta-foundation-core"]
+	path = sub/geta-foundation-core
+	url = https://github.com/Geta/geta-foundation-core
+	branch = upgrade/cms13-2

CHANGELOG.md

@@ -1,19 +1,23 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Geta.Optimizely.ContentTypeIcons", "src\Geta.Optimizely.ContentTypeIcons\Geta.Optimizely.ContentTypeIcons.csproj", "{BFE13B85-6889-44EF-BC5A-188C540186B7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sandbox", "Sandbox", "{E0B839F3-5F6A-44FE-AECE-4730CA5B2E66}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Geta.Optimizely.ContentTypeIcons.EnumGenerator", "src\Geta.Optimizely.ContentTypeIcons.EnumGenerator\Geta.Optimizely.ContentTypeIcons.EnumGenerator.csproj", "{E59EF540-4245-40AE-AFDE-C6DC55F1EC3D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{F066608B-F984-40F2-AD66-F56E314EE584}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Geta.Optimizely.ContentTypeIcons.Tests", "tests\Geta.Optimizely.ContentTypeIcons.Tests\Geta.Optimizely.ContentTypeIcons.Tests.csproj", "{D291CD9F-3E08-4BE0-927C-6CCDD95A8DDE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AlloyMvcTemplates", "sandbox\Alloy\AlloyMvcTemplates.csproj", "{172A9CEB-BB37-452A-B4AB-B70835A1AE51}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "geta-foundation-core", "geta-foundation-core", "{4F9C2A8B-D5E3-5F6A-CA45-8D7E9F3A2C1B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Foundation", "sub\geta-foundation-core\src\Foundation\Foundation.csproj", "{5A0D3B9C-E6F4-4A7B-DB56-9E8FA0B3D2C1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Foundation.AppHost", "sub\geta-foundation-core\src\Foundation.AppHost\Foundation.AppHost.csproj", "{6B1E4CAD-F7A5-4B8C-EC67-AF90B1C4E3D2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Foundation.AppHost.ServiceDefaults", "sub\geta-foundation-core\src\Foundation.AppHost.ServiceDefaults\Foundation.AppHost.ServiceDefaults.csproj", "{7C2F5DBE-A8B6-4C9D-FD78-B0A1C2D5F4E3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -33,17 +37,27 @@ Global
 		{D291CD9F-3E08-4BE0-927C-6CCDD95A8DDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D291CD9F-3E08-4BE0-927C-6CCDD95A8DDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D291CD9F-3E08-4BE0-927C-6CCDD95A8DDE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{172A9CEB-BB37-452A-B4AB-B70835A1AE51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{172A9CEB-BB37-452A-B4AB-B70835A1AE51}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{172A9CEB-BB37-452A-B4AB-B70835A1AE51}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{172A9CEB-BB37-452A-B4AB-B70835A1AE51}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5A0D3B9C-E6F4-4A7B-DB56-9E8FA0B3D2C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5A0D3B9C-E6F4-4A7B-DB56-9E8FA0B3D2C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5A0D3B9C-E6F4-4A7B-DB56-9E8FA0B3D2C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5A0D3B9C-E6F4-4A7B-DB56-9E8FA0B3D2C1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6B1E4CAD-F7A5-4B8C-EC67-AF90B1C4E3D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B1E4CAD-F7A5-4B8C-EC67-AF90B1C4E3D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6B1E4CAD-F7A5-4B8C-EC67-AF90B1C4E3D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6B1E4CAD-F7A5-4B8C-EC67-AF90B1C4E3D2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7C2F5DBE-A8B6-4C9D-FD78-B0A1C2D5F4E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7C2F5DBE-A8B6-4C9D-FD78-B0A1C2D5F4E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7C2F5DBE-A8B6-4C9D-FD78-B0A1C2D5F4E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7C2F5DBE-A8B6-4C9D-FD78-B0A1C2D5F4E3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{D291CD9F-3E08-4BE0-927C-6CCDD95A8DDE} = {F066608B-F984-40F2-AD66-F56E314EE584}
-		{172A9CEB-BB37-452A-B4AB-B70835A1AE51} = {E0B839F3-5F6A-44FE-AECE-4730CA5B2E66}
+		{5A0D3B9C-E6F4-4A7B-DB56-9E8FA0B3D2C1} = {4F9C2A8B-D5E3-5F6A-CA45-8D7E9F3A2C1B}
+		{6B1E4CAD-F7A5-4B8C-EC67-AF90B1C4E3D2} = {4F9C2A8B-D5E3-5F6A-CA45-8D7E9F3A2C1B}
+		{7C2F5DBE-A8B6-4C9D-FD78-B0A1C2D5F4E3} = {4F9C2A8B-D5E3-5F6A-CA45-8D7E9F3A2C1B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {2F7799DB-6899-478C-83D9-60096694B343}