Skip to content

Commit

Permalink
Merge branch 'main' into fix/fluentui-blazor
Browse files Browse the repository at this point in the history
  • Loading branch information
leighboz authored Jul 12, 2023
2 parents cac85f3 + de5857f commit 0626971
Show file tree
Hide file tree
Showing 95 changed files with 4 additions and 11 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
name: CI
on:
push:
paths-ignore:
- "**/*.md"
- "**/*.gitignore"
- "**/*.gitattributes"
- "**/*.yml"
env:
DOTNET_NOLOGO: 1
Configuration: Release
Expand All @@ -25,7 +20,6 @@ jobs:
- run: dotnet build --no-restore
- run: dotnet test --no-build
- run: dotnet format --no-restore --verify-no-changes --verbosity normal
continue-on-error: true # this is temporary until https://github.com/dotnet/sdk/issues/32598

deploy_main:
if: github.ref == 'refs/heads/main'
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/pr-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ jobs:
- run: dotnet build --no-restore
- run: dotnet test --no-build
- run: dotnet format --no-restore --verify-no-changes --verbosity normal
continue-on-error: true # this is temporary until https://github.com/dotnet/sdk/issues/32598

- name: Publish
run: dotnet publish src/Phalanx.App --output ./.build/pub --version-suffix "beta.pr.${{ github.run_number }}"
Expand Down
8 changes: 4 additions & 4 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project>
<ItemGroup>
<PackageVersion Include="Handlebars.Net" Version="2.1.4" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.5" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.5" PrivateAssets="all" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.8" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.8" PrivateAssets="all" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="7.0.1" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
<PackageVersion Include="Microsoft.Fast.Components.FluentUI" Version="2.3.6" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="NuGet.Versioning" Version="6.6.0" />
<PackageVersion Include="NuGet.Versioning" Version="6.6.1" />
<PackageVersion Include="PublishSPAforGitHubPages.Build" Version="2.0.2" />
<PackageVersion Include="WarHub.ArmouryModel.Source" Version="0.13.0" />
<PackageVersion Include="WarHub.ArmouryModel.Workspaces.BattleScribe" Version="0.13.0" />
Expand All @@ -17,7 +17,7 @@
<ItemGroup Label="Tests">
<PackageVersion Include="coverlet.collector" Version="6.0.0" PrivateAssets="all" />
<PackageVersion Include="FluentAssertions" Version="6.11.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageVersion Include="xunit" Version="2.4.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="all" />
</ItemGroup>
Expand Down

0 comments on commit 0626971

Please sign in to comment.