Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Blazor package lock files #1953

Merged
merged 26 commits into from
Mar 27, 2024
Merged

Blazor package lock files #1953

Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
3a6c582
Add package lock file for NimbleBlazor project.
atmgrifter00 Jan 8, 2024
aeb380f
Add all project package.lock files
atmgrifter00 Jan 8, 2024
67b2101
Attempt to fix pipeline
atmgrifter00 Jan 8, 2024
063c0ac
Fix goof.
atmgrifter00 Jan 8, 2024
1554934
Another attempt at a fix.
atmgrifter00 Jan 8, 2024
1edcf17
Merge branch 'main' into blazor-package-lock-files
atmgrifter00 Jan 19, 2024
4501ca5
Merge from main.
atmgrifter00 Jan 19, 2024
85f3756
Update pipeline
atmgrifter00 Jan 19, 2024
74ecf4b
Fix workflow
atmgrifter00 Jan 19, 2024
d897f58
Merge branch 'main' into blazor-package-lock-files
atmgrifter00 Jan 25, 2024
f4977c1
Update lock files.
atmgrifter00 Jan 25, 2024
c4c664c
Remove package lock files from build output.
atmgrifter00 Jan 25, 2024
b3c01a9
Change files
atmgrifter00 Jan 25, 2024
c2c5996
Test if change to version specification gets rid of warning.
atmgrifter00 Jan 25, 2024
c8d7ab0
Merge from main.
atmgrifter00 Mar 7, 2024
e0b719c
Updating package lock files.
atmgrifter00 Mar 7, 2024
086e7a5
Shift around pipeline steps to avoid warning.
atmgrifter00 Mar 7, 2024
76673f9
Merge branch 'main' into blazor-package-lock-files
atmgrifter00 Mar 20, 2024
97161d0
Take out dotnet restore --force-evaluate step.
atmgrifter00 Mar 20, 2024
e6f9c4e
Merge branch 'blazor-package-lock-files' of https://github.com/ni/nim…
atmgrifter00 Mar 20, 2024
8d21bd1
Fix whitespace.
atmgrifter00 Mar 26, 2024
aa5c8b7
Merge branch 'main' into blazor-package-lock-files
atmgrifter00 Mar 27, 2024
51b92e4
Update package lock file.
atmgrifter00 Mar 27, 2024
6e87d04
Merge branch 'main' into blazor-package-lock-files
atmgrifter00 Mar 27, 2024
a9e30d1
Merge branch 'main' into blazor-package-lock-files
atmgrifter00 Mar 27, 2024
6794c30
Update .github/workflows/main.yml
atmgrifter00 Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,18 @@ jobs:
- uses: actions/setup-dotnet@v4
with:
global-json-file: packages/nimble-blazor/global.json
- run: dotnet --info
working-directory: packages/nimble-blazor/
cache: true
cache-dependency-path: '**/packages.lock.json'
- uses: actions/setup-node@v4
with:
node-version: '20'
registry-url: 'https://registry.npmjs.org'
cache: 'npm'
- run: npm ci
- run: dotnet restore --locked-mode
working-directory: packages/nimble-blazor/
- run: dotnet --info
working-directory: packages/nimble-blazor/
atmgrifter00 marked this conversation as resolved.
Show resolved Hide resolved

# print a log of outdated npm dependencies
# only informational so swallow error codes
Expand Down
7 changes: 7 additions & 0 deletions change/@ni-nimble-blazor-7bfff622-19b3-4739-98e6-8ce08d40e6d2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Adding package lock files to allow for reproducible builds",
"packageName": "@ni/nimble-blazor",
"email": "[email protected]",
"dependentChangeType": "patch"
}
8 changes: 8 additions & 0 deletions packages/nimble-blazor/Examples/Demo.Client/Demo.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,13 @@
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
</PropertyGroup>

<ItemGroup>
<Content Remove="packages.lock.json" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.27" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.27" PrivateAssets="all" />
Expand All @@ -24,6 +29,9 @@

<ItemGroup>
<AdditionalFiles Include="..\..\CodeAnalysisDictionary.xml" Link="CodeAnalysisDictionary.xml" />
<None Include="packages.lock.json">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</None>
<PackageReference Include="NI.CSharp.Analyzers" Version="2.0.21" />
</ItemGroup>

Expand Down
Loading
Loading