Merge branch 'main' into angular-column-placeholder

.github/workflows/main.yml

@@ -16,6 +16,7 @@ env:
   LC_ALL: "en_US.UTF-8"
   LANG: "en_US.UTF-8"
   LANGUAGE: "en_US.UTF-8"
+  TZ: "America/Chicago"
   HAS_GITHUBPAGESDEPLOYTOKEN: ${{secrets.GITHUBPAGESDEPLOYTOKEN != ''}}
   HAS_CHROMATIC_PROJECT_TOKEN: ${{secrets.CHROMATIC_PROJECT_TOKEN != ''}}
   HAS_LHCI_GITHUB_APP_TOKEN: ${{secrets.LHCI_GITHUB_APP_TOKEN != ''}}
@@ -45,14 +46,18 @@ jobs:
       - uses: actions/setup-dotnet@v4
         with:
           global-json-file: packages/nimble-blazor/global.json
-      - run: dotnet --info
-        working-directory: packages/nimble-blazor/
       - 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/
+
+      # Print resolved dotnet info
+      - run: dotnet --info
+        working-directory: packages/nimble-blazor/
 
       # print a log of outdated npm dependencies
       # only informational so swallow error codes

angular-workspace/projects/ni/nimble-angular/CHANGELOG.json

@@ -1,6 +1,36 @@
 {
   "name": "@ni/nimble-angular",
   "entries": [
+    {
+      "date": "Wed, 27 Mar 2024 21:22:02 GMT",
+      "version": "20.5.7",
+      "tag": "@ni/nimble-angular_v20.5.7",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v24.1.1",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Wed, 27 Mar 2024 18:54:51 GMT",
+      "version": "20.5.6",
+      "tag": "@ni/nimble-angular_v20.5.6",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v24.1.0",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Wed, 27 Mar 2024 12:05:29 GMT",
       "version": "20.5.5",

angular-workspace/projects/ni/nimble-angular/CHANGELOG.md

@@ -1,9 +1,25 @@
 # Change Log - @ni/nimble-angular
 
-This log was last generated on Wed, 27 Mar 2024 12:05:29 GMT and should not be manually modified.
+This log was last generated on Wed, 27 Mar 2024 21:22:02 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 20.5.7
+
+Wed, 27 Mar 2024 21:22:02 GMT
+
+### Patches
+
+- Bump @ni/nimble-components to v24.1.1
+
+## 20.5.6
+
+Wed, 27 Mar 2024 18:54:51 GMT
+
+### Patches
+
+- Bump @ni/nimble-components to v24.1.0
+
 ## 20.5.5
 
 Wed, 27 Mar 2024 12:05:29 GMT

angular-workspace/projects/ni/nimble-angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ni/nimble-angular",
-  "version": "20.5.5",
+  "version": "20.5.7",
   "description": "Angular components for the NI Nimble Design System",
   "scripts": {
     "invoke-publish": "cd ../../../ && npm run build:library && cd dist/ni/nimble-angular && npm publish"
@@ -31,7 +31,7 @@
     "@angular/forms": "^15.2.10",
     "@angular/localize": "^15.2.10",
     "@angular/router": "^15.2.10",
-    "@ni/nimble-components": "^24.0.1"
+    "@ni/nimble-components": "^24.1.1"
   },
   "dependencies": {
     "tslib": "^2.2.0"

packages/nimble-blazor/CHANGELOG.json

@@ -1,6 +1,21 @@
 {
   "name": "@ni/nimble-blazor",
   "entries": [
+    {
+      "date": "Wed, 27 Mar 2024 20:11:28 GMT",
+      "version": "14.5.7",
+      "tag": "@ni/nimble-blazor_v14.5.7",
+      "comments": {
+        "patch": [
+          {
+            "author": "26874831+atmgrifter00@users.noreply.github.com",
+            "package": "@ni/nimble-blazor",
+            "commit": "6e8a7ad44cba28c2b26c138e57ef16cf0d2a1b90",
+            "comment": "Adding package lock files to allow for reproducible builds"
+          }
+        ]
+      }
+    },
     {
       "date": "Fri, 22 Mar 2024 16:18:25 GMT",
       "version": "14.5.2",

packages/nimble-blazor/CHANGELOG.md

@@ -1,9 +1,17 @@
 # Change Log - @ni/nimble-blazor
 
-This log was last generated on Mon, 18 Mar 2024 17:12:34 GMT and should not be manually modified.
+This log was last generated on Wed, 27 Mar 2024 20:11:28 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 14.5.7
+
+Wed, 27 Mar 2024 20:11:28 GMT
+
+### Patches
+
+- Adding package lock files to allow for reproducible builds ([ni/nimble@6e8a7ad](https://github.com/ni/nimble/commit/6e8a7ad44cba28c2b26c138e57ef16cf0d2a1b90))
+
 ## 14.5.0
 
 Mon, 18 Mar 2024 17:12:34 GMT

packages/nimble-blazor/Examples/Demo.Client/Demo.Client.csproj

@@ -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" />
@@ -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>