Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: KinsonDigital/PackageMonster
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7f2930c61435172b5e4608a22220e76d5119b4ef
Choose a base ref
..
head repository: KinsonDigital/PackageMonster
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c6caf3f7aa32ad5a91cd975548074502f0ea649e
Choose a head ref
2 changes: 1 addition & 1 deletion .github/workflows/add-new-item-to-project.yml
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ jobs:
add_new_issue_to_project:
name: Add New Issue
needs: get_item_number
uses: KinsonDigital/Infrastructure/.github/workflows/add-item-to-project.yml@v13.3.1
uses: KinsonDigital/Infrastructure/.github/workflows/add-item-to-project.yml@v13.6.3
with:
org-name: "${{ vars.ORGANIZATION_NAME }}"
org-project-name: "${{ vars.ORG_PROJECT_NAME }}"
4 changes: 2 additions & 2 deletions .github/workflows/build-status-check.yml
Original file line number Diff line number Diff line change
@@ -10,12 +10,12 @@ on:
jobs:
build_project:
name: ${{ vars.PROJECT_NAME }} Build Status Check
uses: KinsonDigital/Infrastructure/.github/workflows/build-csharp-project.yml@v13.3.1
uses: KinsonDigital/Infrastructure/.github/workflows/build-csharp-project.yml@v13.6.3
with:
project-name: ${{ vars.PROJECT_NAME }}
build-config: Debug
net-sdk-version: ${{ vars.NET_SDK_VERSION }}
checkout-ref: ${{ github.event.pull_request.head.ref }}
checkout-repository: ${{ github.event.pull_request.head.repo.full_name }}
checkout-ref: ${{ github.event.pull_request.head.ref }}
secrets:
cicd-pat: ${{ secrets.CICD_TOKEN }}
7 changes: 3 additions & 4 deletions .github/workflows/prepare-release.yml
Original file line number Diff line number Diff line change
@@ -57,11 +57,10 @@ jobs:
}
$prodVersionRegex = "v[0-9]+\.[0-9]+\.[0-9]+";
$prevVersionRegex = "v[0-9]+\.[0-9]+\.[0-9]+-preview\.[0-9]+";
$versionRegex = "v([1-9]\d*|0)\.([1-9]\d*|0)\.([1-9]\d*|0)(-preview\.([1-9]\d*))?";
# Verify that the version has valid syntax
if (($releaseVersion -match $prodVersionRegex) -or ($releaseVersion -match $prevVersionRegex)) {
if (($releaseVersion -match $versionRegex)) {
Write-Host "::notice::The 'release-version' workflow input is valid.";
} else {
$versionSyntax = $releaseType == "production" ? "v#.#.#" : "v#.#.#-preview.#";
@@ -73,7 +72,7 @@ jobs:
prepare_release:
name: Prepare ${{ inputs.release-type }} Release Of ${{ vars.PROJECT_NAME }}
needs: print_validate_workflow
uses: KinsonDigital/Infrastructure/.github/workflows/prepare-release.yml@v13.3.1
uses: KinsonDigital/Infrastructure/.github/workflows/prepare-release.yml@v13.6.3
with:
project-name: ${{ vars.PROJECT_NAME }}
release-type: ${{ inputs.release-type }}
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@ jobs:
perform_release:
name: Performing ${{ inputs.release-type }} Release of ${{ vars.PROJECT_NAME }} (${{ inputs.release-type == 'Production' && 'Release' || 'Debug' }})
needs: determine_release_notes_path
uses: KinsonDigital/Infrastructure/.github/workflows/dotnet-action-release.yml@v13.3.1
uses: KinsonDigital/Infrastructure/.github/workflows/dotnet-action-release.yml@v13.6.3
with:
project-name: "${{ vars.PROJECT_NAME }}"
release-type: "${{ inputs.release-type }}"
4 changes: 2 additions & 2 deletions .github/workflows/sync-pr-to-issue.yml
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ jobs:
if: |
github.event_name == 'pull_request_target' &&
!startsWith(github.head_ref, 'renovate/')
uses: KinsonDigital/Infrastructure/.github/workflows/initial-manual-sync.yml@v13.3.1
uses: KinsonDigital/Infrastructure/.github/workflows/initial-manual-sync.yml@v13.6.3
with:
issue-or-pr-number: ${{ github.event.pull_request.number }}
sync-type: initial
@@ -35,7 +35,7 @@ jobs:
github.event_name == 'issue_comment' &&
github.event.issue.pull_request && github.event.issue.pull_request.url != null &&
contains(github.event.comment.body, '[run-sync]')
uses: KinsonDigital/Infrastructure/.github/workflows/initial-manual-sync.yml@v13.3.1
uses: KinsonDigital/Infrastructure/.github/workflows/initial-manual-sync.yml@v13.6.3
with:
issue-or-pr-number: ${{ github.event.issue.number }}
sync-type: manual
2 changes: 1 addition & 1 deletion .github/workflows/sync-status-check.yml
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ jobs:
5. PAT
#>
deno run `
--allow-net `
--allow-net --allow-read `
"$scriptUrl" `
"${{ vars.ORGANIZATION_NAME }}" `
"${{ vars.PROJECT_NAME }}" `
4 changes: 2 additions & 2 deletions .github/workflows/unit-test-status-check.yml
Original file line number Diff line number Diff line change
@@ -10,12 +10,12 @@ on:
jobs:
run_tests:
name: ${{ vars.PROJECT_NAME }} Test Status Check
uses: KinsonDigital/Infrastructure/.github/workflows/run-csharp-tests.yml@v13.3.1
uses: KinsonDigital/Infrastructure/.github/workflows/run-csharp-tests.yml@v13.6.3
with:
project-name: ${{ vars.PROJECT_NAME }}Tests
build-config: Debug
net-sdk-version: ${{ vars.NET_SDK_VERSION }}
checkout-ref: ${{ github.event.pull_request.head.ref }}
checkout-repository: ${{ github.event.pull_request.head.repo.full_name }}
checkout-ref: ${{ github.event.pull_request.head.ref }}
secrets:
cicd-pat: ${{ secrets.CICD_TOKEN }}
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Set the base image as the .NET 7.0 SDK (this includes the runtime)
FROM mcr.microsoft.com/dotnet/sdk:8.0 as build-env
FROM mcr.microsoft.com/dotnet/sdk:9.0 as build-env

# Copy everything and publish the release (publish implicitly restores and builds)
COPY . ./
@@ -14,6 +14,6 @@ LABEL homepage="https://github.com/KinsonDigital/PackageMonster"
LABEL com.github.actions.name="Got Nuget"

# Relayer the .NET SDK, anew with the build output
FROM mcr.microsoft.com/dotnet/sdk:8.0
FROM mcr.microsoft.com/dotnet/sdk:9.0
COPY --from=build-env /out .
ENTRYPOINT [ "dotnet", "/PackageMonster.dll" ]
4 changes: 2 additions & 2 deletions PackageMonster/PackageMonster.csproj
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@

<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.9.1" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.4">
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
@@ -32,7 +32,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.IO.Abstractions" Version="19.2.69" />
<PackageReference Include="System.IO.Abstractions" Version="20.0.15" />
</ItemGroup>

<ItemGroup>
10 changes: 5 additions & 5 deletions Testing/PackageMonsterTests/PackageMonsterTests.csproj
Original file line number Diff line number Diff line change
@@ -14,19 +14,19 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.4">
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Moq" Version="[4.18.4,4.19]" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.IO.Abstractions" Version="19.2.69" />
<PackageReference Include="xunit" Version="2.6.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
<PackageReference Include="System.IO.Abstractions" Version="20.0.15" />
<PackageReference Include="xunit" Version="2.6.6" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>