Updated Directory.Packages.support.props to limit the number of depen…

…dencies that are updated to pin different versions. Only pin the ones that cause problems for now (#1251)
RocketSurgeonsGuild · Nov 9, 2023 · 97affc9 · 97affc9
1 parent 3a7c136
commit 97affc9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 33 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -2,10 +2,6 @@
     "version": 1,
     "isRoot": true,
     "tools": {
-        "dotnet-outdated": {
-            "version": "2.11.0",
-            "commands": ["dotnet-outdated"]
-        },
         "gitversion.tool": {
             "version": "5.12.0",
             "commands": ["dotnet-gitversion"]
@@ -37,6 +33,10 @@
         "docfx": {
             "version": "2.73.1",
             "commands": ["docfx"]
+        },
+        "dotnet-outdated-tool": {
+            "version": "4.5.3",
+            "commands": ["dotnet-outdated"]
         }
     }
 }
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -22,9 +22,8 @@
         <NukeTelemetryVersion>1</NukeTelemetryVersion>
         <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
         <ImplicitUsings>enable</ImplicitUsings>
-        <IsTrimmable>true</IsTrimmable>
+        <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">true</IsTrimmable>
         <SuppressTrimAnalysisWarnings>false</SuppressTrimAnalysisWarnings>
-        <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
     </PropertyGroup>
     <ItemGroup>
         <None

diff --git a/Directory.Packages.support.props b/Directory.Packages.support.props
@@ -2,34 +2,11 @@
 <Project>
     <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'">
         <PackageVersion Include="Microsoft.Extensions.DiagnosticAdapter" Version="3.1.32" />
-        <PackageVersion Update="DryIoc.dll" Version="5.4.2" />
-        <PackageVersion Update="DryIoc.Microsoft.DependencyInjection" Version="6.2.0" />
         <PackageVersion Update="Microsoft.AspNetCore.TestHost" Version="3.1.32" />
-        <PackageVersion Update="System.Diagnostics.DiagnosticSource" Version="4.7.1" />
     </ItemGroup>
-    <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'net6.0'">    
-        <PackageVersion Update="Microsoft.Extensions.Configuration" Version="6.0.1" />
-        <PackageVersion Update="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
-        <PackageVersion Update="Microsoft.Extensions.Configuration.CommandLine" Version="6.0.0" />
-        <PackageVersion Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
-        <PackageVersion Update="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
-        <PackageVersion Update="Microsoft.Extensions.Configuration.Ini" Version="6.0.0" />
-        <PackageVersion Update="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
-        <PackageVersion Update="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
-        <PackageVersion Update="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
-        <PackageVersion Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
-        <PackageVersion Update="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
-        <PackageVersion Update="Microsoft.Extensions.Hosting" Version="6.0.1" />
-        <PackageVersion Update="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
-        <PackageVersion Update="Microsoft.Extensions.Logging" Version="6.0.0" />
-        <PackageVersion Update="Microsoft.Extensions.Logging.Abstractions" Version="6.0.4" />
-        <PackageVersion Update="Microsoft.Extensions.Logging.Configuration" Version="6.0.0" />
-        <PackageVersion Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" /> 
-    </ItemGroup>
-    <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">     
+    <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
         <PackageVersion Update="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.24" />
         <PackageVersion Update="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.24" />
-        <PackageVersion Update="Microsoft.AspNetCore.TestHost" Version="6.0.24" />   
-        <PackageVersion Update="System.Diagnostics.DiagnosticSource" Version="6.0.1" />
+        <PackageVersion Update="Microsoft.AspNetCore.TestHost" Version="6.0.24" />
     </ItemGroup>
 </Project>
diff --git a/benchmarks/Hosting.Benchmarks/Hosting.Benchmarks.csproj b/benchmarks/Hosting.Benchmarks/Hosting.Benchmarks.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/sample/Diagnostics/Diagnostics.csproj b/sample/Diagnostics/Diagnostics.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <OutputType>Exe</OutputType>
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
     </PropertyGroup>