Merge pull request #196 from seesharper/version-and-deps-bump

Bumped dependencies and upgrade to net6.0
seesharper · Sep 8, 2022 · b8e1b42 · b8e1b42
2 parents 4171871 + 1dae595
commit b8e1b42
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 52 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,10 +8,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v1
-      - name: Install .Net Core 3.0
-        uses: actions/setup-dotnet@v1.7.2
+      - name: Install .Net Core
+        uses: actions/setup-dotnet@v2.0.0
         with:
-          dotnet-version: 3.1.101
+          dotnet-version: 6.0.300
       - name: Install dotnet-script
         run: dotnet tool install dotnet-script --tool-path dotnet-script-tool
 
@@ -20,4 +20,4 @@ jobs:
         env: # Or as an environment variable
           GITHUB_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           IS_SECURE_BUILDENVIRONMENT: ${{ secrets.IS_SECURE_BUILDENVIRONMENT }}
-          NUGET_APIKEY: ${{ secrets.NUGET_APIKEY }}
+          NUGET_APIKEY: ${{ secrets.NUGET_APIKEY }}
diff --git a/LightInject.Microsoft.DependencyInjection.sln b/LightInject.Microsoft.DependencyInjection.sln
@@ -0,0 +1,41 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30114.105
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{15856E1C-AB65-4DAA-8C57-3478DE8C8420}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LightInject.Microsoft.DependencyInjection", "src\LightInject.Microsoft.DependencyInjection\LightInject.Microsoft.DependencyInjection.csproj", "{F66CEE6C-90B1-4BF8-80E0-5B2594819F59}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LightInject.Microsoft.DependencyInjection.Tests", "src\LightInject.Microsoft.DependencyInjection.Tests\LightInject.Microsoft.DependencyInjection.Tests.csproj", "{8B4FA81E-8014-44D5-8FF1-09287630355C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LightInject.Microsoft.DependencyInjection.Benchmarks", "src\LightInject.Microsoft.DependencyInjection.Benchmarks\LightInject.Microsoft.DependencyInjection.Benchmarks.csproj", "{28EE4FC0-43BB-458A-B186-256207B660B5}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F66CEE6C-90B1-4BF8-80E0-5B2594819F59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F66CEE6C-90B1-4BF8-80E0-5B2594819F59}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F66CEE6C-90B1-4BF8-80E0-5B2594819F59}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F66CEE6C-90B1-4BF8-80E0-5B2594819F59}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8B4FA81E-8014-44D5-8FF1-09287630355C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B4FA81E-8014-44D5-8FF1-09287630355C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B4FA81E-8014-44D5-8FF1-09287630355C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B4FA81E-8014-44D5-8FF1-09287630355C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{28EE4FC0-43BB-458A-B186-256207B660B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28EE4FC0-43BB-458A-B186-256207B660B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28EE4FC0-43BB-458A-B186-256207B660B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28EE4FC0-43BB-458A-B186-256207B660B5}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{F66CEE6C-90B1-4BF8-80E0-5B2594819F59} = {15856E1C-AB65-4DAA-8C57-3478DE8C8420}
+		{8B4FA81E-8014-44D5-8FF1-09287630355C} = {15856E1C-AB65-4DAA-8C57-3478DE8C8420}
+		{28EE4FC0-43BB-458A-B186-256207B660B5} = {15856E1C-AB65-4DAA-8C57-3478DE8C8420}
+	EndGlobalSection
+EndGlobal
diff --git a/build/build.csx b/build/build.csx
@@ -1,4 +1,4 @@
-#load "nuget:Dotnet.Build, 0.15.0"
+#load "nuget:Dotnet.Build, 0.16.1"
 #load "nuget:dotnet-steps, 0.0.2"
 
 [StepDescription("Runs the tests with test coverage")]

diff --git a/omnisharp.json b/omnisharp.json
@@ -9,6 +9,6 @@
   },
   "script": {
     "enableScriptNuGetReferences": true,
-    "defaultTargetFramework": "netcoreapp3.1"
+    "defaultTargetFramework": "net6.0"
   }
-}
+}
diff --git a/...ependencyInjection.Benchmarks/LightInject.Microsoft.DependencyInjection.Benchmarks.csproj b/...ependencyInjection.Benchmarks/LightInject.Microsoft.DependencyInjection.Benchmarks.csproj
@@ -2,11 +2,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/LightInject.Microsoft.DependencyInjection.Benchmarks/Program.cs b/src/LightInject.Microsoft.DependencyInjection.Benchmarks/Program.cs
@@ -10,7 +10,4 @@ class Program
     {
         static void Main(string[] args) => BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args, new DebugInProcessConfig());
     }
-
-
-
 }
diff --git a/...icrosoft.DependencyInjection.Tests/LightInject.Microsoft.DependencyInjection.Tests.csproj b/...icrosoft.DependencyInjection.Tests/LightInject.Microsoft.DependencyInjection.Tests.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="3.1.2">
@@ -11,9 +11,9 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/src/LightInject.Microsoft.DependencyInjection.sln b/src/LightInject.Microsoft.DependencyInjection.sln
diff --git a/...ightInject.Microsoft.DependencyInjection/LightInject.Microsoft.DependencyInjection.csproj b/...ightInject.Microsoft.DependencyInjection/LightInject.Microsoft.DependencyInjection.csproj
@@ -13,13 +13,12 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>portable</DebugType>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <Version>3.4.1</Version>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="LightInject" Version="6.4.1" />
+    <PackageReference Include="LightInject" Version="6.5.1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.354">
       <PrivateAssets>all</PrivateAssets>