diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
index 8de0080..04ebbd1 100644
--- a/.github/workflows/ci-main.yml
+++ b/.github/workflows/ci-main.yml
@@ -10,7 +10,7 @@ env:
NETCORE_VERSION: '3.1.301'
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
DOTNET_CLI_TELEMETRY_OPTOUT: true
- PROJECT_NAME: Blazored.FluentValidation
+ PROJECT_NAME: FluentValidation
GITHUB_FEED: https://nuget.pkg.github.com/Blazored/
GITHUB_USER: chrissainty
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -36,19 +36,37 @@ jobs:
run: dotnet restore
- name: Build
- run: dotnet build -c Release --no-restore src/$PROJECT_NAME/$PROJECT_NAME.csproj
+ run: dotnet build -c Release --no-restore src/Blazored.$PROJECT_NAME/Blazored.$PROJECT_NAME.csproj
- name: Test
run: dotnet test -c Release
- name: Pack
- run: dotnet pack -v normal -c Release --no-restore --include-symbols --include-source -p:PackageVersion=$GITHUB_RUN_ID src/$PROJECT_NAME/$PROJECT_NAME.*proj
+ run: dotnet pack -v normal -c Release --no-restore --include-symbols --include-source -p:PackageVersion=$GITHUB_RUN_ID src/Blazored.$PROJECT_NAME/Blazored.$PROJECT_NAME.*proj
+
+ - name: Publish Sample Site
+ run: dotnet publish -c Release samples/BlazorWebAssembly/BlazorWebAssembly.csproj
+
+ - name: Rewrite base href
+ uses: SteveSandersonMS/ghaction-rewrite-base-href@v1
+ with:
+ html_path: samples/BlazorWebAssembly/bin/Release/netstandard2.1/publish/wwwroot/index.html
+ base_href: /${{ env.PROJECT_NAME }}/
+
+ - name: Deploy to Github Pages
+ uses: JamesIves/github-pages-deploy-action@releases/v3
+ with:
+ ACCESS_TOKEN: $GITHUB_TOKEN
+ BASE_BRANCH: main # The branch the action should deploy from.
+ BRANCH: gh-pages # The branch the action should deploy to.
+ FOLDER: samples/BlazorWebAssembly/bin/Release/netstandard2.1/publish/wwwroot # The folder the action should deploy.
+ SINGLE_COMMIT: true
- name: Upload Artifact
uses: actions/upload-artifact@v2
with:
name: nupkg
- path: ./src/${{ env.PROJECT_NAME }}/bin/Release/*.nupkg
+ path: ./src/Blazored.${{ env.PROJECT_NAME }}/bin/Release/*.nupkg
prerelease:
needs: build
if: github.event_name != 'release'
@@ -81,7 +99,7 @@ jobs:
echo Version: $VERSION
VERSION="${VERSION//v}"
echo Clean Version: $VERSION
- dotnet pack -v normal -c Release --include-symbols --include-source -p:PackageVersion=$VERSION -o nupkg src/$PROJECT_NAME/$PROJECT_NAME.*proj
+ dotnet pack -v normal -c Release --include-symbols --include-source -p:PackageVersion=$VERSION -o nupkg src/Blazored.$PROJECT_NAME/Blazored.$PROJECT_NAME.*proj
- name: Push to GitHub Feed
run: |
for f in ./nupkg/*.nupkg
diff --git a/samples/BlazorWebAssembly/BlazorWebAssembly.csproj b/samples/BlazorWebAssembly/BlazorWebAssembly.csproj
index b720170..167c25a 100644
--- a/samples/BlazorWebAssembly/BlazorWebAssembly.csproj
+++ b/samples/BlazorWebAssembly/BlazorWebAssembly.csproj
@@ -7,9 +7,9 @@