Upgrade to .net 8.0

aimenux · Aug 11, 2024 · 0a46fcb · 0a46fcb
1 parent 73bb366
commit 0a46fcb
Show file tree

Hide file tree

Showing 26 changed files with 19 additions and 23 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,13 +11,13 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

diff --git a/README.md b/README.md
@@ -2,8 +2,8 @@
 
 # PluginArchitectureDemo
 ```  
-Using various ways to illustrate plugin architecture  
-```  
+Using various ways to illustrate plugin architecture
+```
 
 > In this demo, i m using various ways in order to illustrate the use of plugin architecture.
 >
@@ -18,4 +18,4 @@ Using various ways to illustrate plugin architecture
 > :bulb: Plugins are copied on `plugins` folder on post build events and loaded at startup by the application.
 >
 
-**`Tools`** : vs22, net 6.0, autofac, simple-injector, scrutor, fluent-validation
+**`Tools`** : net 8.0, autofac, simple-injector, scrutor, fluent-validation
diff --git a/plugins/Example01.Plugin.Slack.dll b/plugins/Example01.Plugin.Slack.dll
diff --git a/plugins/Example01.Plugin.Teams.dll b/plugins/Example01.Plugin.Teams.dll
diff --git a/plugins/Example02.Plugin.Slack.dll b/plugins/Example02.Plugin.Slack.dll
diff --git a/plugins/Example02.Plugin.Teams.dll b/plugins/Example02.Plugin.Teams.dll
diff --git a/plugins/Example03.Plugin.Slack.dll b/plugins/Example03.Plugin.Slack.dll
diff --git a/plugins/Example03.Plugin.Teams.dll b/plugins/Example03.Plugin.Teams.dll
diff --git a/plugins/Example04.Plugin.Slack.dll b/plugins/Example04.Plugin.Slack.dll
diff --git a/plugins/Example04.Plugin.Teams.dll b/plugins/Example04.Plugin.Teams.dll
diff --git a/src/Example01/Example01.App/Program.cs b/src/Example01/Example01.App/Program.cs
@@ -4,7 +4,6 @@
 using Microsoft.Extensions.DependencyInjection;
 
 var configuration = new ConfigurationBuilder()
-    .SetBasePath(Directory.GetCurrentDirectory())
     .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
     .Build();
 

diff --git a/src/Example01/Example01.App/appsettings.json b/src/Example01/Example01.App/appsettings.json
@@ -6,7 +6,7 @@
     }
   },
   "Settings": {
-    "PluginsPath": "..\\..\\..\\..\\..\\..\\plugins",
+    "PluginsPath": "plugins",
     "PluginsPattern": "Example01.Plugin.*.dll"
   }
 }
diff --git a/src/Example01/Example01.Plugin.Slack/Example01.Plugin.Slack.csproj b/src/Example01/Example01.Plugin.Slack/Example01.Plugin.Slack.csproj
@@ -9,7 +9,7 @@
       <ProjectReference Include="..\Example01.Core\Example01.Core.csproj" />
     </ItemGroup>
 
-    <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(Configuration)' == 'Debug'">
+    <Target Name="PostBuild" AfterTargets="PostBuildEvent">
       <Exec Command="copy /Y $(TargetDir)$(TargetName).dll $(SolutionDir)plugins" />
     </Target>
 

diff --git a/src/Example01/Example01.Plugin.Teams/Example01.Plugin.Teams.csproj b/src/Example01/Example01.Plugin.Teams/Example01.Plugin.Teams.csproj
@@ -9,7 +9,7 @@
       <ProjectReference Include="..\Example01.Core\Example01.Core.csproj" />
     </ItemGroup>
 
-    <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(Configuration)' == 'Debug'">
+    <Target Name="PostBuild" AfterTargets="PostBuildEvent">
         <Exec Command="copy /Y $(TargetDir)$(TargetName).dll $(SolutionDir)plugins" />
     </Target>
 

diff --git a/src/Example02/Example02.App/Program.cs b/src/Example02/Example02.App/Program.cs
@@ -4,7 +4,6 @@
 using Microsoft.Extensions.DependencyInjection;
 
 var configuration = new ConfigurationBuilder()
-    .SetBasePath(Directory.GetCurrentDirectory())
     .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
     .Build();
 

diff --git a/src/Example02/Example02.App/appsettings.json b/src/Example02/Example02.App/appsettings.json
@@ -6,7 +6,7 @@
     }
   },
   "Settings": {
-    "PluginsPath": "..\\..\\..\\..\\..\\..\\plugins",
+    "PluginsPath": "plugins",
     "PluginsPattern": "Example02.Plugin.*.dll"
   }
 }
diff --git a/src/Example02/Example02.Plugin.Slack/Example02.Plugin.Slack.csproj b/src/Example02/Example02.Plugin.Slack/Example02.Plugin.Slack.csproj
@@ -9,7 +9,7 @@
       <ProjectReference Include="..\Example02.Core\Example02.Core.csproj" />
     </ItemGroup>
 
-    <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(Configuration)' == 'Debug'">
+    <Target Name="PostBuild" AfterTargets="PostBuildEvent">
       <Exec Command="copy /Y $(TargetDir)$(TargetName).dll $(SolutionDir)plugins" />
     </Target>
 

diff --git a/src/Example02/Example02.Plugin.Teams/Example02.Plugin.Teams.csproj b/src/Example02/Example02.Plugin.Teams/Example02.Plugin.Teams.csproj
@@ -9,7 +9,7 @@
       <ProjectReference Include="..\Example02.Core\Example02.Core.csproj" />
     </ItemGroup>
 
-    <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(Configuration)' == 'Debug'">
+    <Target Name="PostBuild" AfterTargets="PostBuildEvent">
         <Exec Command="copy /Y $(TargetDir)$(TargetName).dll $(SolutionDir)plugins" />
     </Target>
 

diff --git a/src/Example03/Example03.App/Program.cs b/src/Example03/Example03.App/Program.cs
@@ -4,7 +4,6 @@
 using Microsoft.Extensions.Configuration;
 
 var configuration = new ConfigurationBuilder()
-    .SetBasePath(Directory.GetCurrentDirectory())
     .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
     .Build();
 

diff --git a/src/Example03/Example03.App/appsettings.json b/src/Example03/Example03.App/appsettings.json
@@ -6,7 +6,7 @@
     }
   },
   "Settings": {
-    "PluginsPath": "..\\..\\..\\..\\..\\..\\plugins",
+    "PluginsPath": "plugins",
     "PluginsPattern": "Example03.Plugin.*.dll"
   }
 }
diff --git a/src/Example03/Example03.Plugin.Slack/Example03.Plugin.Slack.csproj b/src/Example03/Example03.Plugin.Slack/Example03.Plugin.Slack.csproj
@@ -9,7 +9,7 @@
       <ProjectReference Include="..\Example03.Core\Example03.Core.csproj" />
     </ItemGroup>
 
-    <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(Configuration)' == 'Debug'">
+    <Target Name="PostBuild" AfterTargets="PostBuildEvent">
       <Exec Command="copy /Y $(TargetDir)$(TargetName).dll $(SolutionDir)plugins" />
     </Target>
 

diff --git a/src/Example03/Example03.Plugin.Teams/Example03.Plugin.Teams.csproj b/src/Example03/Example03.Plugin.Teams/Example03.Plugin.Teams.csproj
@@ -9,7 +9,7 @@
       <ProjectReference Include="..\Example03.Core\Example03.Core.csproj" />
     </ItemGroup>
 
-    <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(Configuration)' == 'Debug'">
+    <Target Name="PostBuild" AfterTargets="PostBuildEvent">
         <Exec Command="copy /Y $(TargetDir)$(TargetName).dll $(SolutionDir)plugins" />
     </Target>
 

diff --git a/src/Example04/Example04.App/Program.cs b/src/Example04/Example04.App/Program.cs
@@ -3,7 +3,6 @@
 using Microsoft.Extensions.Configuration;
 
 var configuration = new ConfigurationBuilder()
-    .SetBasePath(Directory.GetCurrentDirectory())
     .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
     .Build();
 

diff --git a/src/Example04/Example04.App/appsettings.json b/src/Example04/Example04.App/appsettings.json
@@ -6,7 +6,7 @@
     }
   },
   "Settings": {
-    "PluginsPath": "..\\..\\..\\..\\..\\..\\plugins",
+    "PluginsPath": "plugins",
     "PluginsPattern": "Example04.Plugin.*.dll"
   }
 }
diff --git a/src/Example04/Example04.Plugin.Slack/Example04.Plugin.Slack.csproj b/src/Example04/Example04.Plugin.Slack/Example04.Plugin.Slack.csproj
@@ -9,7 +9,7 @@
       <ProjectReference Include="..\Example04.Core\Example04.Core.csproj" />
     </ItemGroup>
 
-    <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(Configuration)' == 'Debug'">
+    <Target Name="PostBuild" AfterTargets="PostBuildEvent">
       <Exec Command="copy /Y $(TargetDir)$(TargetName).dll $(SolutionDir)plugins" />
     </Target>
 

diff --git a/src/Example04/Example04.Plugin.Teams/Example04.Plugin.Teams.csproj b/src/Example04/Example04.Plugin.Teams/Example04.Plugin.Teams.csproj
@@ -9,7 +9,7 @@
       <ProjectReference Include="..\Example04.Core\Example04.Core.csproj" />
     </ItemGroup>
 
-    <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(Configuration)' == 'Debug'">
+    <Target Name="PostBuild" AfterTargets="PostBuildEvent">
         <Exec Command="copy /Y $(TargetDir)$(TargetName).dll $(SolutionDir)plugins" />
     </Target>