Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/nuget/Ardalis.Result.AspNetCore-7…
Browse files Browse the repository at this point in the history
….2.0
  • Loading branch information
ardalis authored Dec 23, 2023
2 parents dc80b5c + f208d2e commit 1109c25
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
- name: Setup .NET Core
id: setup_dotnet_core
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: '7.0.x'
include-prerelease: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dotnetcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: '7.0.x'
include-prerelease: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: actions/checkout@v3

- name: Setup .NET Core
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: '7.0.x'
include-prerelease: true
Expand Down
4 changes: 2 additions & 2 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,11 @@
<PackageVersion Include="WindowsAzure.Storage" Version="9.3.3" />
<PackageVersion Include="xunit" Version="2.6.1" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.3" />
<PackageVersion Include="xunit.runner.console" Version="2.5.0">
<PackageVersion Include="xunit.runner.console" Version="2.6.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
<PackageVersion Include="xunit.runner.reporters" Version="2.5.0" />
<PackageVersion Include="xunit.runner.reporters" Version="2.6.4" />
<PackageVersion Include="XunitXml.TestLogger" Version="3.1.17" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ public async Task<IActionResult> OnPostAsync(string captcha, string inviteCode,
await _userRoleMembershipService.AddUserToRoleAsync(userId, memberRole.Id);
}

return RedirectToRoute("/User/MyProfile");
return Redirect("/User/MyProfile");
}

foreach (var error in result.Errors)
Expand Down

0 comments on commit 1109c25

Please sign in to comment.