Merge pull request #53 from Cratis:fix/bump-dependencymodel

Fix/bump-dependencymodel

.github/workflows/dotnet-build.yml

@@ -1,5 +1,8 @@
 name: .NET Build
 
+env:
+  DOTNET_VERSION: "8.0.x"
+
 on:
   workflow_dispatch:
     inputs:
@@ -34,7 +37,7 @@ jobs:
       - name: Setup .Net
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: "6.0.400"
+          dotnet-version: ${{ env.DOTNET_VERSION }}
 
       - name: Build & run tests for root
         run: dotnet test --configuration Release

.github/workflows/javascript-build.yml

@@ -1,5 +1,8 @@
 name: JavaScript Build
 
+env:
+  NODE_VERSION: "22.x"
+
 on:
   workflow_dispatch:
     inputs:
@@ -31,10 +34,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Setup node v20
+      - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: ${{ env.NODE_VERSION }}
           registry-url: "https://registry.npmjs.org"
 
       - uses: actions/cache@v3

.github/workflows/publish.yml

@@ -1,8 +1,9 @@
 name: Publish
 
 env:
-  NUGET_OUTPUT: ./Artifacts/NuGet
-  DOTNET_VERSION: "6.0.400"
+  NUGET_OUTPUT: ./Artifacts/NuGet 
+  DOTNET_VERSION: "8.0.x"
+  NODE_VERSION: "22.x"
 
 on:
   workflow_dispatch:
@@ -86,13 +87,13 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Setup node v20
+      - name: Setup node
         uses: actions/setup-node@v4
         env:
           NPM_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
         with:
-          node-version: 20.x
+          node-version: ${{ env.NODE_VERSION }}
           registry-url: "https://registry.npmjs.org"
 
       - uses: actions/cache@v3

Directory.Packages.props

@@ -4,7 +4,7 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-		<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
+		<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
 		<PackageVersion Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
 		<PackageVersion Include="System.Reactive" Version="6.0.1" />
 		<PackageVersion Include="Humanizer" Version="2.14.1" />

Samples/Directory.Build.props

@@ -0,0 +1,7 @@
+<Project>
+    <Import Project="../Directory.Build.props" />
+
+    <PropertyGroup>
+        <NoWarn>$(NoWarn);SA0001</NoWarn>
+    </PropertyGroup>
+</Project>

Samples/TypeDiscovery/FirstImplementation.cs

@@ -1,5 +1,3 @@
 namespace TypeDiscovery;
 
-public class FirstImplementation : ISomeInterface
-{
-}
+public class FirstImplementation : ISomeInterface;

Samples/TypeDiscovery/ISomeInterface.cs

@@ -1,5 +1,3 @@
 namespace TypeDiscovery;
 
-public interface ISomeInterface
-{   
-}
+public interface ISomeInterface;

Samples/TypeDiscovery/Program.cs

@@ -1,4 +1,5 @@
-using Cratis.Types;
+using Cratis.Collections;
+using Cratis.Types;
 
 namespace TypeDiscovery;
 
@@ -8,5 +9,6 @@ public static void Main()
     {
         var types = new Types();
         var typesFound = types.FindMultiple<ISomeInterface>();
+        typesFound.ForEach(type => Console.WriteLine(type.FullName));
     }
 }

Samples/TypeDiscovery/SecondImplementation.cs

@@ -1,5 +1,3 @@
 namespace TypeDiscovery;
 
-public class SecondImplementation : ISomeInterface
-{
-}
+public class SecondImplementation : ISomeInterface;

Source/DotNET/Fundamentals/Types/PackageReferencedAssemblies.cs

@@ -45,7 +45,10 @@ public void Initialize()
             }
 
             var entryAssembly = Assembly.GetEntryAssembly();
+            if (entryAssembly is null) return;
+
             var dependencyModel = DependencyContext.Load(entryAssembly);
+            if (dependencyModel is null) return;
 
             var assemblies = dependencyModel.RuntimeLibraries
                                 .Where(_ => !_.Type.Equals("project") &&

Source/DotNET/Fundamentals/Types/ProjectReferencedAssemblies.cs

@@ -43,6 +43,8 @@ public void Initialize()
 
             var entryAssembly = Assembly.GetEntryAssembly()!;
             var dependencyModel = DependencyContext.Load(entryAssembly);
+            if (dependencyModel is null) return;
+
             var projectReferencedAssemblies = dependencyModel.RuntimeLibraries
                                 .Where(_ => _.Type.Equals("project"))
                                 .Select(_ => AssemblyHelpers.Resolve(_.Name)!)

global.json

@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "8.0.0",
+        "version": "8.0.401",
         "rollForward": "latestFeature"
     }
 }

mocha-setup.js

@@ -1,13 +1,14 @@
 // Copyright (c) Cratis. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-require('reflect-metadata');
-
-const chai = require('chai');
-global.expect = chai.expect;
-const should = chai.should();
-global.sinon = require('sinon');
-const sinonChai = require('sinon-chai');
-const chaiAsPromised = require('chai-as-promised');
-chai.use(sinonChai);
-chai.use(chaiAsPromised);
+(async () => {
+    await import('reflect-metadata');
+    const chai = await import('chai');
+    global.expect = chai.expect;
+    const should = chai.should();
+    global.sinon = await import('sinon');
+    const sinonChai = await import('sinon-chai');
+    const chaiAsPromised = await import('chai-as-promised');
+    chai.use(sinonChai.default);
+     chai.use(chaiAsPromised.default);
+})();

tsconfig.json

@@ -34,7 +34,6 @@
         "noFallthroughCasesInSwitch": true,
         "stripInternal": true,
         "allowSyntheticDefaultImports": true,
-        "watch": true,
         "forceConsistentCasingInFileNames": true,
         "assumeChangesOnlyAffectDirectDependencies": true,
         "alwaysStrict": true,