Merge pull request #3 from mjczone/develop

Develop
mjczone · Dec 12, 2024 · 804573f · 804573f
2 parents 1384517 + cfe78a6
commit 804573f
Show file tree

Hide file tree

Showing 297 changed files with 33,848 additions and 19,620 deletions.
diff --git a/.editorconfig b/.editorconfig
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -26,12 +26,35 @@ jobs:
         run: dotnet build --configuration Release /p:Version=${VERSION_NUMBER}
 
       - name: Test
-        run: dotnet test --configuration Release /p:Version=${VERSION_NUMBER} --no-build
+        run: |
+          dotnet test --configuration Release /p:Version=${VERSION_NUMBER} --no-build
+          # replace VERSION_NUMBER in docs/docs.config.json with ${VERSION_NUMBER}
+          sed -i "s/VERSION_NUMBER/${VERSION_NUMBER}/g" docs/docs.config.json
 
       - name: Pack
         run: dotnet pack --configuration Release /p:Version=${VERSION_NUMBER} --no-build --output nupkgs
 
       - name: Push
         run: dotnet nuget push nupkgs/${PACKAGE_ID}.${VERSION_NUMBER}.nupkg
         env:
-          PACKAGE_ID: "DapperMatic"
+          PACKAGE_ID: "MJCZone.DapperMatic"
+
+      - name: Upload Pages Artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: docs/
+
+  # Deploy to GitHub Pages
+  deploy:
+    needs: build
+    permissions:
+      pages: write
+      id-token: write
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,13 @@
 *.userosscache
 *.sln.docstates
 __delete/
+nuget.config
+
+# DocFx generated files
+docs/**/toc.yml
+docs/reference/
+_site
+_pdf
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,8 @@
+{
+  "files.associations": {
+    "*.vue": "html"
+  },
+  "vetur.validation.template": false,
+  "vetur.validation.script": false,
+  "vetur.validation.style": false
+}
diff --git a/DapperMatic.sln → MJCZone.DapperMatic.sln b/DapperMatic.sln → MJCZone.DapperMatic.sln
@@ -5,15 +5,18 @@ VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{80E77F84-7DB0-4CBF-9E43-4A6E9F1758B2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DapperMatic", "src\DapperMatic\DapperMatic.csproj", "{48C04108-798F-4CED-8874-D146500778EB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MJCZone.DapperMatic", "src\MJCZone.DapperMatic\MJCZone.DapperMatic.csproj", "{48C04108-798F-4CED-8874-D146500778EB}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{C1CEAB9E-CD38-4AA7-B004-B0248F7C39A7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DapperMatic.Tests", "tests\DapperMatic.Tests\DapperMatic.Tests.csproj", "{9FF5A12B-6617-4492-9BD0-434C58051054}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MJCZone.DapperMatic.Tests", "tests\MJCZone.DapperMatic.Tests\MJCZone.DapperMatic.Tests.csproj", "{9FF5A12B-6617-4492-9BD0-434C58051054}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution Files", "{93285C01-B819-4C94-8A18-0CCC817EB3EE}"
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
+		src\build\dotnet\CodeAnalysis.ruleset = src\build\dotnet\CodeAnalysis.ruleset
+		src\build\dotnet\common.props = src\build\dotnet\common.props
+		src\Directory.Build.props = src\Directory.Build.props
 	EndProjectSection
 EndProject
 Global