From 8a3c1cd758cbc13d49d029274383ce9a4969d8d6 Mon Sep 17 00:00:00 2001
From: Pavle Ciric <plaveongit@outlook.com>
Date: Mon, 18 Nov 2024 11:02:52 +0100
Subject: [PATCH 1/5] Implement central package versioning

Implementing central package versioning cleans up
project files of overwritten versions of transitive
dependecies.
---
 Directory.Packages.props                      | 29 +++++++++++++++++++
 properties/service_fabric_common.props        |  4 ---
 .../service_fabric_managed_stylecop.props     |  2 +-
 ...viceFabric.AspNetCore.Configuration.csproj |  4 +--
 ...ft.ServiceFabric.AspNetCore.HttpSys.csproj |  4 +--
 ...ft.ServiceFabric.AspNetCore.Kestrel.csproj | 13 ++-------
 .../Microsoft.ServiceFabric.AspNetCore.csproj | 11 ++-----
 7 files changed, 38 insertions(+), 29 deletions(-)
 create mode 100644 Directory.Packages.props

diff --git a/Directory.Packages.props b/Directory.Packages.props
new file mode 100644
index 0000000..e886b41
--- /dev/null
+++ b/Directory.Packages.props
@@ -0,0 +1,29 @@
+<Project>
+    <PropertyGroup>
+      <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+      <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
+    </PropertyGroup>
+
+    <!-- TODO Sort packages by name to reduce merge conflicts -->
+
+    <!-- Versions of some transitive dependencies have been overwritten due the the fact that 
+    they have been marked as vulnerable.  -->
+
+    <!-- TODO Each time direct dependecies are updated, the transitive
+    dependencies should be revised to see if overwriting their version is still necessary.-->
+
+    <ItemGroup>
+        <PackageVersion Include="Microsoft.AspNetCore.Hosting" Version="2.1.1" />
+        <PackageVersion Include="Microsoft.AspNetCore.Http" Version="2.1.34" /> <!-- Transitive dependecy -->
+        <PackageVersion Include="Microsoft.AspNetCore.Server.HttpSys" Version="2.1.12" />
+        <PackageVersion Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.3" />
+        <PackageVersion Include="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.1.25" /> <!-- Transitive dependecy -->
+        <PackageVersion Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="2.1.40" /> <!-- Transitive dependecy -->
+        <PackageVersion Include="Microsoft.Extensions.Configuration" Version="2.1.1" />
+        <PackageVersion Include="Microsoft.ServiceFabric" Version="11.0.1004" />
+        <PackageVersion Include="Microsoft.ServiceFabric.Services" Version="8.0.1004" />
+        <PackageVersion Include="System.IO.Pipelines" Version="8.0.0" /> <!-- Transitive dependecy -->
+        <PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" /> <!-- Transitive dependecy -->
+        <PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" />
+    </ItemGroup>
+  </Project> 
\ No newline at end of file
diff --git a/properties/service_fabric_common.props b/properties/service_fabric_common.props
index f28600f..34ce6a9 100644
--- a/properties/service_fabric_common.props
+++ b/properties/service_fabric_common.props
@@ -19,10 +19,6 @@
     <!-- Set Nuget exe path -->
     <NuGetExePath Condition="'$(NuGetExePath)' == ''">$(RepoRoot)\nuget\nuget.exe</NuGetExePath>
 
-    <!-- Versions used for Microsoft.ServiceFabric.* nuget packages from other repos.-->
-    <NugetPkg_Version_Microsoft_ServiceFabric>11.0.1004</NugetPkg_Version_Microsoft_ServiceFabric>
-    <NugetPkg_Version_Microsoft_ServiceFabric_Services>8.0.1004</NugetPkg_Version_Microsoft_ServiceFabric_Services>
-
     <!-- Set versions for files and nuget packages nuget packages generated from this repo. -->
     <!-- TODO: Versions numbers are changed here manually for now, Integrate this with GitVersion. -->
     <MajorVersion>8</MajorVersion>
diff --git a/properties/service_fabric_managed_stylecop.props b/properties/service_fabric_managed_stylecop.props
index 9b4b5f6..db659fe 100644
--- a/properties/service_fabric_managed_stylecop.props
+++ b/properties/service_fabric_managed_stylecop.props
@@ -5,7 +5,7 @@
     <StylecopSuppressionsFile>$(MSBuildThisFileDirectory)stylecop\StylecopSuppressions.cs</StylecopSuppressionsFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />
+    <PackageReference Include="StyleCop.Analyzers"/>
   </ItemGroup>
   <ItemGroup>
     <None Remove="$(StylecopSettingsFile)" />
diff --git a/src/Microsoft.ServiceFabric.AspNetCore.Configuration/Microsoft.ServiceFabric.AspNetCore.Configuration.csproj b/src/Microsoft.ServiceFabric.AspNetCore.Configuration/Microsoft.ServiceFabric.AspNetCore.Configuration.csproj
index 3cce717..6620375 100644
--- a/src/Microsoft.ServiceFabric.AspNetCore.Configuration/Microsoft.ServiceFabric.AspNetCore.Configuration.csproj
+++ b/src/Microsoft.ServiceFabric.AspNetCore.Configuration/Microsoft.ServiceFabric.AspNetCore.Configuration.csproj
@@ -9,13 +9,13 @@
     <TargetFrameworks>net462;net8.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.ServiceFabric.Services" Version="$(NugetPkg_Version_Microsoft_ServiceFabric_Services)" />
+    <PackageReference Include="Microsoft.ServiceFabric.Services" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration"/>
   </ItemGroup>
   <ItemGroup>
     <Compile Update="SR.Designer.cs">
diff --git a/src/Microsoft.ServiceFabric.AspNetCore.HttpSys/Microsoft.ServiceFabric.AspNetCore.HttpSys.csproj b/src/Microsoft.ServiceFabric.AspNetCore.HttpSys/Microsoft.ServiceFabric.AspNetCore.HttpSys.csproj
index f74384e..e2f751a 100644
--- a/src/Microsoft.ServiceFabric.AspNetCore.HttpSys/Microsoft.ServiceFabric.AspNetCore.HttpSys.csproj
+++ b/src/Microsoft.ServiceFabric.AspNetCore.HttpSys/Microsoft.ServiceFabric.AspNetCore.HttpSys.csproj
@@ -9,13 +9,13 @@
     <TargetFrameworks>net462;net8.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.ServiceFabric" Version="$(NugetPkg_Version_Microsoft_ServiceFabric)" />
+    <PackageReference Include="Microsoft.ServiceFabric" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
-    <PackageReference Include="Microsoft.AspNetCore.Server.HttpSys" Version="2.1.12" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.HttpSys"/>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ServiceFabric.AspNetCore\Microsoft.ServiceFabric.AspNetCore.csproj" />
diff --git a/src/Microsoft.ServiceFabric.AspNetCore.Kestrel/Microsoft.ServiceFabric.AspNetCore.Kestrel.csproj b/src/Microsoft.ServiceFabric.AspNetCore.Kestrel/Microsoft.ServiceFabric.AspNetCore.Kestrel.csproj
index 49ee580..33051c6 100644
--- a/src/Microsoft.ServiceFabric.AspNetCore.Kestrel/Microsoft.ServiceFabric.AspNetCore.Kestrel.csproj
+++ b/src/Microsoft.ServiceFabric.AspNetCore.Kestrel/Microsoft.ServiceFabric.AspNetCore.Kestrel.csproj
@@ -9,22 +9,13 @@
     <TargetFrameworks>net462;net8.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.ServiceFabric" Version="$(NugetPkg_Version_Microsoft_ServiceFabric)" />
+    <PackageReference Include="Microsoft.ServiceFabric" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
-    <!-- Direct dependencies -->
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.0" />
-    <!-- Overriding versions of transitive dependencies -->
-    <!-- 
-      Some versions of transitive dependencies have to be overwritten, since the default versions
-      defined by the direct dependencies are marked as vulnerable packages on nuget.org.
-    -->
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.1.25"/>
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="2.1.40" />
-    <PackageReference Include="System.IO.Pipelines" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel"/>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.ServiceFabric.AspNetCore\Microsoft.ServiceFabric.AspNetCore.csproj" />
diff --git a/src/Microsoft.ServiceFabric.AspNetCore/Microsoft.ServiceFabric.AspNetCore.csproj b/src/Microsoft.ServiceFabric.AspNetCore/Microsoft.ServiceFabric.AspNetCore.csproj
index 0ddcec5..c199dab 100644
--- a/src/Microsoft.ServiceFabric.AspNetCore/Microsoft.ServiceFabric.AspNetCore.csproj
+++ b/src/Microsoft.ServiceFabric.AspNetCore/Microsoft.ServiceFabric.AspNetCore.csproj
@@ -9,20 +9,13 @@
     <TargetFrameworks>net462;net8.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.ServiceFabric.Services" Version="$(NugetPkg_Version_Microsoft_ServiceFabric_Services)" />
+    <PackageReference Include="Microsoft.ServiceFabric.Services" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
-    <!-- Direct dependencies -->
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
-    <!-- Overriding versions of transitive dependencies -->
-    <!-- 
-      Some versions of transitive dependencies have to be overwritten, since the default versions
-      defined by the direct dependencies are marked as vulnerable packages on nuget.org.
-    -->
-    <PackageReference Include="System.Text.Encodings.Web" Version="8.0.0"/>
+    <PackageReference Include="Microsoft.AspNetCore.Hosting"/>
   </ItemGroup>
   <ItemGroup>
     <Compile Update="SR.Designer.cs">

From 64295b0eb97f85ee4df86fbb67011c72fd057fb8 Mon Sep 17 00:00:00 2001
From: Pavle Ciric <plaveongit@outlook.com>
Date: Mon, 18 Nov 2024 12:08:59 +0100
Subject: [PATCH 2/5] Migrate test projects to central package versioning

---
 Directory.Packages.props                             |  5 +++++
 .../Microsoft.ServiceFabric.AspNetCore.Tests.csproj  | 12 ++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index e886b41..be6552f 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -13,6 +13,7 @@
     dependencies should be revised to see if overwriting their version is still necessary.-->
 
     <ItemGroup>
+        <PackageVersion Include="FluentAssertions" Version="6.12.0" />
         <PackageVersion Include="Microsoft.AspNetCore.Hosting" Version="2.1.1" />
         <PackageVersion Include="Microsoft.AspNetCore.Http" Version="2.1.34" /> <!-- Transitive dependecy -->
         <PackageVersion Include="Microsoft.AspNetCore.Server.HttpSys" Version="2.1.12" />
@@ -20,10 +21,14 @@
         <PackageVersion Include="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.1.25" /> <!-- Transitive dependecy -->
         <PackageVersion Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="2.1.40" /> <!-- Transitive dependecy -->
         <PackageVersion Include="Microsoft.Extensions.Configuration" Version="2.1.1" />
+        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
         <PackageVersion Include="Microsoft.ServiceFabric" Version="11.0.1004" />
         <PackageVersion Include="Microsoft.ServiceFabric.Services" Version="8.0.1004" />
+        <PackageVersion Include="Moq" Version="4.20.70" />
         <PackageVersion Include="System.IO.Pipelines" Version="8.0.0" /> <!-- Transitive dependecy -->
         <PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" /> <!-- Transitive dependecy -->
         <PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" />
+        <PackageVersion Include="xunit" Version="2.8.1" />
+        <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.1" />
     </ItemGroup>
   </Project> 
\ No newline at end of file
diff --git a/test/unittests/Microsoft.ServiceFabric.AspNetCore.Tests/Microsoft.ServiceFabric.AspNetCore.Tests.csproj b/test/unittests/Microsoft.ServiceFabric.AspNetCore.Tests/Microsoft.ServiceFabric.AspNetCore.Tests.csproj
index 29bb1cc..72ba09d 100644
--- a/test/unittests/Microsoft.ServiceFabric.AspNetCore.Tests/Microsoft.ServiceFabric.AspNetCore.Tests.csproj
+++ b/test/unittests/Microsoft.ServiceFabric.AspNetCore.Tests/Microsoft.ServiceFabric.AspNetCore.Tests.csproj
@@ -10,12 +10,12 @@
   </PropertyGroup>
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="Microsoft.ServiceFabric.Services" Version="$(NugetPkg_Version_Microsoft_ServiceFabric_Services)" />
-    <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="xunit" Version="2.8.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
+    <PackageReference Include="FluentAssertions"/>
+    <PackageReference Include="Microsoft.ServiceFabric.Services"/>
+    <PackageReference Include="Moq"/>
+    <PackageReference Include="xunit"/>
+    <PackageReference Include="Microsoft.NET.Test.Sdk"/>
+    <PackageReference Include="xunit.runner.visualstudio">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

From c7e2d4c6b6c8b2aead6f939bd5e43bc0a5f91baf Mon Sep 17 00:00:00 2001
From: Pavle Ciric <plaveongit@outlook.com>
Date: Mon, 18 Nov 2024 12:10:22 +0100
Subject: [PATCH 3/5] Disable unused NuGet projects

NuGet projects which package SDK binaries are no
longer in use and have been disabled. SF.AspNetCore.Internal
is the only one left in use and it has been left enabled.
---
 properties/service_fabric_nuget.targets | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/properties/service_fabric_nuget.targets b/properties/service_fabric_nuget.targets
index 8632524..43fd673 100644
--- a/properties/service_fabric_nuget.targets
+++ b/properties/service_fabric_nuget.targets
@@ -2,11 +2,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <!-- List of .nuproj to build to generate nuget packages -->
-    <NuprojsToBuild Include="$(RepoRoot)nuprojs\Microsoft.ServiceFabric.AspNetCore.Abstractions\Microsoft.ServiceFabric.AspNetCore.Abstractions.nuproj;
-                     $(RepoRoot)nuprojs\Microsoft.ServiceFabric.AspNetCore.Configuration\Microsoft.ServiceFabric.AspNetCore.Configuration.nuproj;
-                     $(RepoRoot)nuprojs\Microsoft.ServiceFabric.AspNetCore.HttpSys\Microsoft.ServiceFabric.AspNetCore.HttpSys.nuproj;
-                     $(RepoRoot)nuprojs\Microsoft.ServiceFabric.AspNetCore.Kestrel\Microsoft.ServiceFabric.AspNetCore.Kestrel.nuproj;
-                     $(RepoRoot)nuprojs\SF.AspNetCore.Internal\SF.AspNetCore.Internal.nuproj;"/>
+    <NuprojsToBuild Include="$(RepoRoot)nuprojs\SF.AspNetCore.Internal\SF.AspNetCore.Internal.nuproj;"/>
     
     <!-- List of packages.config to restore nuget packages -->
         <PackagesConfigs Include="nuprojs\packages.config"/>
@@ -18,13 +14,8 @@
     <Exec Command="&quot;$(NuGetExePath)&quot; restore %(PackagesConfigs.Identity) -NonInteractive -Verbosity quiet" />
     <Message Text="Generating NuGet packages ..." Importance="High"/>
     <MSBuild Projects ="@(NuprojsToBuild)" ContinueOnError ="false" Properties="Configuration=$(Configuration)" BuildInParallel="true"/>
-
     <Message Text="Copying NuGet packages to drop folder ..." Importance="High"/>
     <ItemGroup>
-      <Nupkgs Include="nuprojs\Microsoft.ServiceFabric.AspNetCore.Abstractions\$(OutputPath)\Microsoft.ServiceFabric.AspNetCore.Abstractions.*.nupkg"/>
-      <Nupkgs Include="nuprojs\Microsoft.ServiceFabric.AspNetCore.Configuration\$(OutputPath)\Microsoft.ServiceFabric.AspNetCore.Configuration.*.nupkg"/>
-      <Nupkgs Include="nuprojs\Microsoft.ServiceFabric.AspNetCore.HttpSys\$(OutputPath)\Microsoft.ServiceFabric.AspNetCore.HttpSys.*.nupkg"/>
-      <Nupkgs Include="nuprojs\Microsoft.ServiceFabric.AspNetCore.Kestrel\$(OutputPath)\Microsoft.ServiceFabric.AspNetCore.Kestrel.*.nupkg"/>
       <Nupkgs Include="nuprojs\SF.AspNetCore.Internal\$(OutputPath)\SF.AspNetCore.Internal.*.nupkg"/>
     </ItemGroup>
     <Copy SourceFiles="@(Nupkgs)" DestinationFiles="@(Nupkgs->'$(NugetPackageDropFolder)\%(Destination)\%(Filename)%(Extension)')" />

From 28b08313e07822ea3dcfe621f5640110f8395d7f Mon Sep 17 00:00:00 2001
From: Pavle Ciric <plaveongit@outlook.com>
Date: Mon, 18 Nov 2024 18:02:49 +0100
Subject: [PATCH 4/5] Disable unused NuGet projects

Projects for generating NuGet packages are no
longer in use and have been removed.
---
 ...rviceFabric.AspNetCore.Abstractions.nuproj | 80 ------------------
 ...viceFabric.AspNetCore.Configuration.nuproj | 81 -------------------
 ...ft.ServiceFabric.AspNetCore.HttpSys.nuproj | 81 -------------------
 ...ft.ServiceFabric.AspNetCore.Kestrel.nuproj | 81 -------------------
 4 files changed, 323 deletions(-)
 delete mode 100644 nuprojs/Microsoft.ServiceFabric.AspNetCore.Abstractions/Microsoft.ServiceFabric.AspNetCore.Abstractions.nuproj
 delete mode 100644 nuprojs/Microsoft.ServiceFabric.AspNetCore.Configuration/Microsoft.ServiceFabric.AspNetCore.Configuration.nuproj
 delete mode 100644 nuprojs/Microsoft.ServiceFabric.AspNetCore.HttpSys/Microsoft.ServiceFabric.AspNetCore.HttpSys.nuproj
 delete mode 100644 nuprojs/Microsoft.ServiceFabric.AspNetCore.Kestrel/Microsoft.ServiceFabric.AspNetCore.Kestrel.nuproj

diff --git a/nuprojs/Microsoft.ServiceFabric.AspNetCore.Abstractions/Microsoft.ServiceFabric.AspNetCore.Abstractions.nuproj b/nuprojs/Microsoft.ServiceFabric.AspNetCore.Abstractions/Microsoft.ServiceFabric.AspNetCore.Abstractions.nuproj
deleted file mode 100644
index 0e1c451..0000000
--- a/nuprojs/Microsoft.ServiceFabric.AspNetCore.Abstractions/Microsoft.ServiceFabric.AspNetCore.Abstractions.nuproj
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-  <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Import Project="..\..\properties\service_fabric_nuget.props" />
-    
-    <PropertyGroup>
-      <Id>Microsoft.ServiceFabric.AspNetCore.Abstractions</Id>
-      <Title>Microsoft.ServiceFabric.AspNetCore.Abstractions</Title>
-      <Description>This package provides abstractions for creating AspNetCore Service Fabric microservices.</Description>
-      <Summary>This package provides abstractions for creating AspNetCore Service Fabric microservices.</Summary>
-      <Tags>ServiceFabric Microsoft Azure Fabric</Tags>
-      <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
-    </PropertyGroup>
-
-    <Import Project="$(NuProjPath)\NuProj.props" />
-    <Import Project="$(NuProjPath)\NuProj.targets" />
-
-    <ItemGroup>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.dll">
-        <TargetPath>lib\net462</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.xml">
-        <TargetPath>lib\net462</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.dll">
-        <TargetPath>lib\net47</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.xml">
-        <TargetPath>lib\net47</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.dll">
-        <TargetPath>lib\net471</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.xml">
-        <TargetPath>lib\net471</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.dll">
-        <TargetPath>lib\net472</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.xml">
-        <TargetPath>lib\net472</TargetPath>
-      </File>
-      <File Include="$(DropFolderNet8)Microsoft.ServiceFabric.AspNetCore.xml">
-        <TargetPath>lib\net8.0</TargetPath>
-      </File>
-      <File Include="$(DropFolderNet8)Microsoft.ServiceFabric.AspNetCore.dll">
-        <TargetPath>lib\net8.0</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)Microsoft.ServiceFabric.AspNetCore.dll">
-        <TargetPath>runtimes\win\lib\net462</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)Microsoft.ServiceFabric.AspNetCore.dll">
-        <TargetPath>runtimes\win\lib\net47</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)Microsoft.ServiceFabric.AspNetCore.dll">
-        <TargetPath>runtimes\win\lib\net471</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)Microsoft.ServiceFabric.AspNetCore.dll">
-        <TargetPath>runtimes\win\lib\net472</TargetPath>
-      </File>
-    </ItemGroup>
-    
-    <ItemGroup>
-      <Dependency Include="Microsoft.ServiceFabric.Services">
-        <Version>[$(NugetPkg_Version_Microsoft_ServiceFabric_Services)]</Version>
-        <TargetFramework>net8.0</TargetFramework>
-      </Dependency>
-      <FrameworkReference Include="Microsoft.AspNetCore.App">
-        <TargetFramework>net8.0</TargetFramework>
-      </FrameworkReference>
-
-      <Dependency Include="Microsoft.ServiceFabric.Services">
-        <Version>[$(NugetPkg_Version_Microsoft_ServiceFabric_Services)]</Version>
-        <TargetFramework>net462</TargetFramework>
-      </Dependency>
-      <Dependency Include="Microsoft.AspNetCore.Hosting">
-        <Version>2.2.7</Version>
-        <TargetFramework>net462</TargetFramework>
-      </Dependency>
-    </ItemGroup>
-  </Project>
diff --git a/nuprojs/Microsoft.ServiceFabric.AspNetCore.Configuration/Microsoft.ServiceFabric.AspNetCore.Configuration.nuproj b/nuprojs/Microsoft.ServiceFabric.AspNetCore.Configuration/Microsoft.ServiceFabric.AspNetCore.Configuration.nuproj
deleted file mode 100644
index 0522bef..0000000
--- a/nuprojs/Microsoft.ServiceFabric.AspNetCore.Configuration/Microsoft.ServiceFabric.AspNetCore.Configuration.nuproj
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-  <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Import Project="..\..\properties\service_fabric_nuget.props" />
-    
-    <PropertyGroup>
-      <Id>Microsoft.ServiceFabric.AspNetCore.Configuration</Id>
-      <Title>Microsoft.ServiceFabric.AspNetCore.Configuration</Title>
-      <Description>This package provides Configuration for creating AspNetCore Service Fabric microservices.</Description>
-      <Summary>This package provides Configuration for creating AspNetCore Service Fabric microservices.</Summary>
-      <Tags>ServiceFabric Microsoft Azure Fabric</Tags>
-      <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
-    </PropertyGroup>
-
-    <Import Project="$(NuProjPath)\NuProj.props" />
-    <Import Project="$(NuProjPath)\NuProj.targets" />
-
-    <ItemGroup>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.Configuration.dll">
-        <TargetPath>lib\net462</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.Configuration.xml">
-        <TargetPath>lib\net462</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.Configuration.dll">
-        <TargetPath>lib\net47</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.Configuration.xml">
-        <TargetPath>lib\net47</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.Configuration.dll">
-        <TargetPath>lib\net471</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.Configuration.xml">
-        <TargetPath>lib\net471</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.Configuration.dll">
-        <TargetPath>lib\net472</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.Configuration.xml">
-        <TargetPath>lib\net472</TargetPath>
-      </File>
-      <File Include="$(DropFolderNet8)Microsoft.ServiceFabric.AspNetCore.Configuration.dll">
-        <TargetPath>lib\net8.0</TargetPath>
-      </File>
-      <File Include="$(DropFolderNet8)Microsoft.ServiceFabric.AspNetCore.Configuration.xml">
-        <TargetPath>lib\net8.0</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)Microsoft.ServiceFabric.AspNetCore.Configuration.dll">
-        <TargetPath>runtimes\win\lib\net462</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)Microsoft.ServiceFabric.AspNetCore.Configuration.dll">
-        <TargetPath>runtimes\win\lib\net47</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)Microsoft.ServiceFabric.AspNetCore.Configuration.dll">
-        <TargetPath>runtimes\win\lib\net471</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)Microsoft.ServiceFabric.AspNetCore.Configuration.dll">
-        <TargetPath>runtimes\win\lib\net472</TargetPath>
-      </File>
-    </ItemGroup>
-
-    <ItemGroup>
-
-      <Dependency Include="Microsoft.ServiceFabric.Services">
-        <Version>[$(NugetPkg_Version_Microsoft_ServiceFabric_Services)]</Version>
-        <TargetFramework>net8.0</TargetFramework>
-      </Dependency>
-      <FrameworkReference Include="Microsoft.AspNetCore.App">
-        <TargetFramework>net8.0</TargetFramework>
-      </FrameworkReference>
-
-      <Dependency Include="Microsoft.ServiceFabric.Services">
-        <Version>[$(NugetPkg_Version_Microsoft_ServiceFabric_Services)]</Version>
-        <TargetFramework>net462</TargetFramework>
-      </Dependency>
-      <Dependency Include="Microsoft.Extensions.Configuration">
-        <Version>2.1.0</Version>
-        <TargetFramework>net462</TargetFramework>
-      </Dependency>
-    </ItemGroup>
-  </Project>
diff --git a/nuprojs/Microsoft.ServiceFabric.AspNetCore.HttpSys/Microsoft.ServiceFabric.AspNetCore.HttpSys.nuproj b/nuprojs/Microsoft.ServiceFabric.AspNetCore.HttpSys/Microsoft.ServiceFabric.AspNetCore.HttpSys.nuproj
deleted file mode 100644
index 89e61e3..0000000
--- a/nuprojs/Microsoft.ServiceFabric.AspNetCore.HttpSys/Microsoft.ServiceFabric.AspNetCore.HttpSys.nuproj
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-  <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Import Project="..\..\properties\service_fabric_nuget.props" />
-    
-    <PropertyGroup>
-    <Id>Microsoft.ServiceFabric.AspNetCore.HttpSys</Id>
-    <Title>Microsoft.ServiceFabric.AspNetCore.HttpSys</Title>
-    <Description>This package provides AspNetCore HttpSys server based communication listener for Service Fabric microservices.</Description>
-    <Summary>This package provides AspNetCore HttpSys server based communication listener for Service Fabric microservices.</Summary>
-    <Tags>ServiceFabric Microsoft Azure Fabric</Tags>
-    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
-    </PropertyGroup>
-
-    <Import Project="$(NuProjPath)\NuProj.props" />
-    <Import Project="$(NuProjPath)\NuProj.targets" />
-
-    <ItemGroup>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.HttpSys.dll">
-        <TargetPath>lib\net462</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.HttpSys.xml">
-        <TargetPath>lib\net462</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.HttpSys.dll">
-        <TargetPath>lib\net47</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.HttpSys.xml">
-        <TargetPath>lib\net47</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.HttpSys.dll">
-        <TargetPath>lib\net471</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.HttpSys.xml">
-        <TargetPath>lib\net471</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.HttpSys.dll">
-        <TargetPath>lib\net472</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.HttpSys.xml">
-        <TargetPath>lib\net472</TargetPath>
-      </File>
-      <File Include="$(DropFolderNet8)Microsoft.ServiceFabric.AspNetCore.HttpSys.dll">
-        <TargetPath>lib\net8.0</TargetPath>
-      </File>
-      <File Include="$(DropFolderNet8)Microsoft.ServiceFabric.AspNetCore.HttpSys.xml">
-        <TargetPath>lib\net8.0</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)Microsoft.ServiceFabric.AspNetCore.HttpSys.dll">
-        <TargetPath>runtimes\win\lib\net462</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)Microsoft.ServiceFabric.AspNetCore.HttpSys.dll">
-        <TargetPath>runtimes\win\lib\net47</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)Microsoft.ServiceFabric.AspNetCore.HttpSys.dll">
-        <TargetPath>runtimes\win\lib\net471</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)Microsoft.ServiceFabric.AspNetCore.HttpSys.dll">
-        <TargetPath>runtimes\win\lib\net472</TargetPath>
-      </File>
-    </ItemGroup>
-
-    <ItemGroup>
-
-      <Dependency Include="Microsoft.ServiceFabric.AspNetCore.Abstractions">
-        <Version>[$(NuGetPackageVersion)]</Version>
-        <TargetFramework>net8.0</TargetFramework>
-      </Dependency>
-      <FrameworkReference Include="Microsoft.AspNetCore.App">
-        <TargetFramework>net8.0</TargetFramework>
-      </FrameworkReference>
-
-      <Dependency Include="Microsoft.ServiceFabric.AspNetCore.Abstractions">
-        <Version>[$(NuGetPackageVersion)]</Version>
-        <TargetFramework>net462</TargetFramework>
-      </Dependency>
-      <Dependency Include="Microsoft.AspNetCore.Server.HttpSys">
-        <Version>2.1.12</Version>
-        <TargetFramework>net462</TargetFramework>
-      </Dependency>
-    </ItemGroup>
-  </Project>
diff --git a/nuprojs/Microsoft.ServiceFabric.AspNetCore.Kestrel/Microsoft.ServiceFabric.AspNetCore.Kestrel.nuproj b/nuprojs/Microsoft.ServiceFabric.AspNetCore.Kestrel/Microsoft.ServiceFabric.AspNetCore.Kestrel.nuproj
deleted file mode 100644
index 3c01914..0000000
--- a/nuprojs/Microsoft.ServiceFabric.AspNetCore.Kestrel/Microsoft.ServiceFabric.AspNetCore.Kestrel.nuproj
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-  <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Import Project="..\..\properties\service_fabric_nuget.props" />
-    
-    <PropertyGroup>
-      <Id>Microsoft.ServiceFabric.AspNetCore.Kestrel</Id>
-      <Title>Microsoft.ServiceFabric.AspNetCore.Kestrel</Title>
-      <Description>This package provides AspNetCore Kestrel based communication listener for Service Fabric microservices.</Description>
-      <Summary>This package provides AspNetCore Kestrel based communication listener for Service Fabric microservices.</Summary>
-      <Tags>ServiceFabric Microsoft Azure Fabric</Tags>
-      <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
-    </PropertyGroup>
-
-    <Import Project="$(NuProjPath)\NuProj.props" />
-    <Import Project="$(NuProjPath)\NuProj.targets" />
-
-    <ItemGroup>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.Kestrel.dll">
-        <TargetPath>lib\net462</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.Kestrel.xml">
-        <TargetPath>lib\net462</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.Kestrel.dll">
-        <TargetPath>lib\net47</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.Kestrel.xml">
-        <TargetPath>lib\net47</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.Kestrel.dll">
-        <TargetPath>lib\net471</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.Kestrel.xml">
-        <TargetPath>lib\net471</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.Kestrel.dll">
-        <TargetPath>lib\net472</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.AspNetCore.Kestrel.xml">
-        <TargetPath>lib\net472</TargetPath>
-      </File>
-      <File Include="$(DropFolderNet8)Microsoft.ServiceFabric.AspNetCore.Kestrel.dll">
-        <TargetPath>lib\net8.0</TargetPath>
-      </File>
-      <File Include="$(DropFolderNet8)Microsoft.ServiceFabric.AspNetCore.Kestrel.xml">
-       <TargetPath>lib\net8.0</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)Microsoft.ServiceFabric.AspNetCore.Kestrel.dll">
-        <TargetPath>runtimes\win\lib\net462</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)Microsoft.ServiceFabric.AspNetCore.Kestrel.dll">
-        <TargetPath>runtimes\win\lib\net47</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)Microsoft.ServiceFabric.AspNetCore.Kestrel.dll">
-        <TargetPath>runtimes\win\lib\net471</TargetPath>
-      </File>
-      <File Include="$(DropFolderNetFramework)Microsoft.ServiceFabric.AspNetCore.Kestrel.dll">
-        <TargetPath>runtimes\win\lib\net472</TargetPath>
-      </File>
-    </ItemGroup>
-
-    <ItemGroup>
-
-      <Dependency Include="Microsoft.ServiceFabric.AspNetCore.Abstractions">
-        <Version>[$(NuGetPackageVersion)]</Version>
-        <TargetFramework>net8.0</TargetFramework>
-      </Dependency>
-      <FrameworkReference Include="Microsoft.AspNetCore.App">
-        <TargetFramework>net8.0</TargetFramework>
-      </FrameworkReference>
-
-      <Dependency Include="Microsoft.ServiceFabric.AspNetCore.Abstractions">
-        <Version>[$(NuGetPackageVersion)]</Version>
-        <TargetFramework>net462</TargetFramework>
-      </Dependency>
-      <Dependency Include="Microsoft.AspNetCore.Server.Kestrel">
-        <Version>2.1.0</Version>
-        <TargetFramework>net462</TargetFramework>
-      </Dependency>
-    </ItemGroup>
-  </Project>

From d6d82c1b5de8b5cad00317fb8f52abd9ee575761 Mon Sep 17 00:00:00 2001
From: Pavle Ciric <plaveongit@outlook.com>
Date: Mon, 18 Nov 2024 18:14:22 +0100
Subject: [PATCH 5/5] Remove TODO tags from Directory.Packages.props

---
 Directory.Packages.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index be6552f..4affe58 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -4,12 +4,12 @@
       <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
     </PropertyGroup>
 
-    <!-- TODO Sort packages by name to reduce merge conflicts -->
+    <!-- Sort packages by name to reduce merge conflicts -->
 
     <!-- Versions of some transitive dependencies have been overwritten due the the fact that 
     they have been marked as vulnerable.  -->
 
-    <!-- TODO Each time direct dependecies are updated, the transitive
+    <!-- Each time direct dependecies are updated, the transitive
     dependencies should be revised to see if overwriting their version is still necessary.-->
 
     <ItemGroup>