diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 00000000..64048aab --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,44 @@ + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nuprojs/Microsoft.ServiceFabric.Actors.KVSToRCMigration/Microsoft.ServiceFabric.Actors.KVSToRCMigration.nuproj b/nuprojs/Microsoft.ServiceFabric.Actors.KVSToRCMigration/Microsoft.ServiceFabric.Actors.KVSToRCMigration.nuproj deleted file mode 100644 index 160cb9d9..00000000 --- a/nuprojs/Microsoft.ServiceFabric.Actors.KVSToRCMigration/Microsoft.ServiceFabric.Actors.KVSToRCMigration.nuproj +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - Microsoft.ServiceFabric.Actors.KVSToRCMigration - Microsoft.ServiceFabric.Actors.KVSToRCMigration - This package contains the Actor Framework KVS to RC Migration APIs. - This package contains the Actor Framework KVS to RC Migration APIs. - ServiceFabric Microsoft Azure Fabric Actors - v4.8.1 - - - - - - - - lib\net462 - - - lib\net462 - - - lib\net47 - - - lib\net47 - - - lib\net471 - - - lib\net471 - - - lib\net472 - - - lib\net472 - - - lib\netstandard2.0 - - - lib\netstandard2.0 - - - runtimes\win\lib\net462 - - - runtimes\win\lib\net47 - - - runtimes\win\lib\net471 - - - runtimes\win\lib\net472 - - - - - - [$(NuGetPackageVersion)] - - - 2.2.0 - - - 2.2.7 - - - 2.2.0 - - - 2.2.0 - - - 2.2.0 - - - \ No newline at end of file diff --git a/nuprojs/Microsoft.ServiceFabric.Actors.Wcf/Microsoft.ServiceFabric.Actors.Wcf.nuproj b/nuprojs/Microsoft.ServiceFabric.Actors.Wcf/Microsoft.ServiceFabric.Actors.Wcf.nuproj deleted file mode 100644 index c9932f5e..00000000 --- a/nuprojs/Microsoft.ServiceFabric.Actors.Wcf/Microsoft.ServiceFabric.Actors.Wcf.nuproj +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - Microsoft.ServiceFabric.Actors.Wcf - Microsoft.ServiceFabric.Actors.Wcf - This package provides Windows Communication Foundation (WCF) to be used as the communication mechanism for Service Fabric microservices built using the Actor Framework APIs. - This package provides Windows Communication Foundation (WCF) to be used as the communication mechanism for Service Fabric microservices built using the Actor Framework APIs. - ServiceFabric Microsoft Azure Fabric Actors - v4.8.1 - - - - - - - - lib\net462 - - - lib\net462 - - - - - - [$(NuGetPackageVersion)] - - - [$(NuGetPackageVersion)] - - - diff --git a/nuprojs/Microsoft.ServiceFabric.Actors/Microsoft.ServiceFabric.Actors.nuproj b/nuprojs/Microsoft.ServiceFabric.Actors/Microsoft.ServiceFabric.Actors.nuproj deleted file mode 100644 index ebd1b0bd..00000000 --- a/nuprojs/Microsoft.ServiceFabric.Actors/Microsoft.ServiceFabric.Actors.nuproj +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - Microsoft.ServiceFabric.Actors - Microsoft.ServiceFabric.Actors - This package contains the common Actor Framework APIs for building and connecting to reliable services on Microsoft Service Fabric. - This package contains the common Actor Framework APIs for building and connecting to reliable services on Microsoft Service Fabric. - ServiceFabric Microsoft Azure Fabric Actors - v4.8.1 - - - - - - - - lib\net462 - - - lib\net462 - - - lib\net47 - - - lib\net47 - - - lib\net471 - - - lib\net471 - - - lib\net472 - - - lib\net472 - - - lib\netstandard2.0 - - - lib\netstandard2.0 - - - runtimes\win\lib\net462 - - - runtimes\win\lib\net47 - - - runtimes\win\lib\net471 - - - runtimes\win\lib\net472 - - - build\net462 - - - build\net462 - - - - - build\netcoreapp2.0 - - - build\netcoreapp2.0 - - - build\netcoreapp2.0 - - - build\netcoreapp2.0 - - - build\netcoreapp2.0 - - - - build\netcoreapp2.0 - - - build\netcoreapp2.0 - - - build\netcoreapp2.0 - - - build\netcoreapp2.0 - - - build\netcoreapp2.0 - - - build\netcoreapp2.0 - - - build\netcoreapp2.0 - - - build\netcoreapp2.0 - - - build\netcoreapp2.0 - - - build\netcoreapp2.0 - - - build\netcoreapp2.0 - - - - - - [$(NuGetPackageVersion)] - - - \ No newline at end of file diff --git a/nuprojs/Microsoft.ServiceFabric.Services.Remoting/Microsoft.ServiceFabric.Services.Remoting.nuproj b/nuprojs/Microsoft.ServiceFabric.Services.Remoting/Microsoft.ServiceFabric.Services.Remoting.nuproj deleted file mode 100644 index 3007b0df..00000000 --- a/nuprojs/Microsoft.ServiceFabric.Services.Remoting/Microsoft.ServiceFabric.Services.Remoting.nuproj +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - Microsoft.ServiceFabric.Services.Remoting - Microsoft.ServiceFabric.Services.Remoting - This package contains Service Framework Remoting APIs for building and connecting to reliable services on Microsoft Service Fabric. - This package contains Service Framework Remoting APIs for building and connecting to reliable services on Microsoft Service Fabric. - ServiceFabric Microsoft Azure Fabric - v4.8.1 - - - - - - - - lib\net462 - - - lib\net462 - - - lib\net47 - - - lib\net47 - - - lib\net471 - - - lib\net471 - - - lib\net472 - - - lib\net472 - - - lib\netstandard2.0 - - - lib\netstandard2.0 - - - runtimes\win\lib\net462 - - - runtimes\win\lib\net47 - - - runtimes\win\lib\net471 - - - runtimes\win\lib\net472 - - - - - - [$(NuGetPackageVersion)] - - - [$(NugetPkg_Version_Microsoft_ServiceFabric_FabricTransport_Internal)] - - - diff --git a/nuprojs/Microsoft.ServiceFabric.Services.Wcf/Microsoft.ServiceFabric.Services.Wcf.nuproj b/nuprojs/Microsoft.ServiceFabric.Services.Wcf/Microsoft.ServiceFabric.Services.Wcf.nuproj deleted file mode 100644 index e7eace1a..00000000 --- a/nuprojs/Microsoft.ServiceFabric.Services.Wcf/Microsoft.ServiceFabric.Services.Wcf.nuproj +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - Microsoft.ServiceFabric.Services.Wcf - Microsoft.ServiceFabric.Services.Wcf - This package provides Windows Communication Foundation (WCF) to be used as the communication mechanism for Service Fabric microservices. - This package provides Windows Communication Foundation (WCF) to be used as the communication mechanism for Service Fabric microservices. - ServiceFabric Microsoft Azure Fabric - v4.8.1 - - - - - - - - lib\net462 - - - lib\net462 - - - - - - [$(NuGetPackageVersion)] - - - diff --git a/nuprojs/Microsoft.ServiceFabric.Services/Microsoft.ServiceFabric.Services.nuproj b/nuprojs/Microsoft.ServiceFabric.Services/Microsoft.ServiceFabric.Services.nuproj deleted file mode 100644 index b57c2931..00000000 --- a/nuprojs/Microsoft.ServiceFabric.Services/Microsoft.ServiceFabric.Services.nuproj +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - Microsoft.ServiceFabric.Services - Microsoft.ServiceFabric.Services - This package contains the common Service Framework APIs for building and connecting to reliable services on Microsoft Service Fabric. - This package contains the common Service Framework APIs for building and connecting to reliable services on Microsoft Service Fabric. - ServiceFabric Microsoft Azure Fabric - v4.8.1 - - - - - - - - lib\net462 - - - lib\net462 - - - lib\net47 - - - lib\net47 - - - lib\net471 - - - lib\net471 - - - lib\net472 - - - lib\net472 - - - lib\netstandard2.0 - - - lib\netstandard2.0 - - - runtimes\win\lib\net462 - - - runtimes\win\lib\net47 - - - runtimes\win\lib\net471 - - - runtimes\win\lib\net472 - - - - - - [$(NugetPkg_Version_Microsoft_ServiceFabric_Data)] - - - [$(NugetPkg_Version_Microsoft_ServiceFabric_Diagnostics_Internal)] - - - diff --git a/properties/service_fabric_common.props b/properties/service_fabric_common.props index cf8a4b92..79053c2a 100644 --- a/properties/service_fabric_common.props +++ b/properties/service_fabric_common.props @@ -20,13 +20,6 @@ $(RepoRoot)\nuget\nuget.exe - - - 11.0.1928 - 8.0.1928 - 8.0.1928 - 8.0.1928 - 8 diff --git a/properties/service_fabric_nuget.targets b/properties/service_fabric_nuget.targets index b3e6a0c3..918aa8b5 100644 --- a/properties/service_fabric_nuget.targets +++ b/properties/service_fabric_nuget.targets @@ -2,13 +2,7 @@ - + @@ -23,13 +17,7 @@ - - - - - - diff --git a/src/Microsoft.ServiceFabric.Actors.KVSToRCMigration/Microsoft.ServiceFabric.Actors.KVSToRCMigration.csproj b/src/Microsoft.ServiceFabric.Actors.KVSToRCMigration/Microsoft.ServiceFabric.Actors.KVSToRCMigration.csproj index fcea9adc..6e72f143 100644 --- a/src/Microsoft.ServiceFabric.Actors.KVSToRCMigration/Microsoft.ServiceFabric.Actors.KVSToRCMigration.csproj +++ b/src/Microsoft.ServiceFabric.Actors.KVSToRCMigration/Microsoft.ServiceFabric.Actors.KVSToRCMigration.csproj @@ -12,31 +12,20 @@ 1591 - - - - + + + + - - - - - - - - - - - - - + + + + + diff --git a/src/Microsoft.ServiceFabric.Actors/Microsoft.ServiceFabric.Actors.csproj b/src/Microsoft.ServiceFabric.Actors/Microsoft.ServiceFabric.Actors.csproj index 0e372432..4e0f66cc 100644 --- a/src/Microsoft.ServiceFabric.Actors/Microsoft.ServiceFabric.Actors.csproj +++ b/src/Microsoft.ServiceFabric.Actors/Microsoft.ServiceFabric.Actors.csproj @@ -12,9 +12,9 @@ 1591 - - - + + + diff --git a/src/Microsoft.ServiceFabric.Services.Remoting/Microsoft.ServiceFabric.Services.Remoting.csproj b/src/Microsoft.ServiceFabric.Services.Remoting/Microsoft.ServiceFabric.Services.Remoting.csproj index 946ffc2e..59c48fe4 100644 --- a/src/Microsoft.ServiceFabric.Services.Remoting/Microsoft.ServiceFabric.Services.Remoting.csproj +++ b/src/Microsoft.ServiceFabric.Services.Remoting/Microsoft.ServiceFabric.Services.Remoting.csproj @@ -10,8 +10,8 @@ net462 - - + + diff --git a/src/Microsoft.ServiceFabric.Services/Microsoft.ServiceFabric.Services.csproj b/src/Microsoft.ServiceFabric.Services/Microsoft.ServiceFabric.Services.csproj index f1fbf6a2..451ed916 100644 --- a/src/Microsoft.ServiceFabric.Services/Microsoft.ServiceFabric.Services.csproj +++ b/src/Microsoft.ServiceFabric.Services/Microsoft.ServiceFabric.Services.csproj @@ -10,9 +10,9 @@ net462 - - - + + + diff --git a/src/netstandard/Microsoft.ServiceFabric.Actors.KVSToRCMigration/Microsoft.ServiceFabric.Actors.KVSToRCMigration_netstandard.csproj b/src/netstandard/Microsoft.ServiceFabric.Actors.KVSToRCMigration/Microsoft.ServiceFabric.Actors.KVSToRCMigration_netstandard.csproj index f048417e..4375a649 100644 --- a/src/netstandard/Microsoft.ServiceFabric.Actors.KVSToRCMigration/Microsoft.ServiceFabric.Actors.KVSToRCMigration_netstandard.csproj +++ b/src/netstandard/Microsoft.ServiceFabric.Actors.KVSToRCMigration/Microsoft.ServiceFabric.Actors.KVSToRCMigration_netstandard.csproj @@ -20,29 +20,17 @@ - - - - - - - + + + + + + + - - - - - - - - - \ No newline at end of file diff --git a/src/netstandard/Microsoft.ServiceFabric.Actors/Microsoft.ServiceFabric.Actors_netstandard.csproj b/src/netstandard/Microsoft.ServiceFabric.Actors/Microsoft.ServiceFabric.Actors_netstandard.csproj index c0c58db7..c3c5601d 100644 --- a/src/netstandard/Microsoft.ServiceFabric.Actors/Microsoft.ServiceFabric.Actors_netstandard.csproj +++ b/src/netstandard/Microsoft.ServiceFabric.Actors/Microsoft.ServiceFabric.Actors_netstandard.csproj @@ -39,8 +39,8 @@ - - + + diff --git a/src/netstandard/Microsoft.ServiceFabric.Services.Remoting/Microsoft.ServiceFabric.Services.Remoting_netstandard.csproj b/src/netstandard/Microsoft.ServiceFabric.Services.Remoting/Microsoft.ServiceFabric.Services.Remoting_netstandard.csproj index f234014c..cec984a9 100644 --- a/src/netstandard/Microsoft.ServiceFabric.Services.Remoting/Microsoft.ServiceFabric.Services.Remoting_netstandard.csproj +++ b/src/netstandard/Microsoft.ServiceFabric.Services.Remoting/Microsoft.ServiceFabric.Services.Remoting_netstandard.csproj @@ -31,9 +31,9 @@ - - - + + + diff --git a/src/netstandard/Microsoft.ServiceFabric.Services/Microsoft.ServiceFabric.Services_netstandard.csproj b/src/netstandard/Microsoft.ServiceFabric.Services/Microsoft.ServiceFabric.Services_netstandard.csproj index 00d33283..925f860d 100644 --- a/src/netstandard/Microsoft.ServiceFabric.Services/Microsoft.ServiceFabric.Services_netstandard.csproj +++ b/src/netstandard/Microsoft.ServiceFabric.Services/Microsoft.ServiceFabric.Services_netstandard.csproj @@ -27,9 +27,9 @@ - - - + + + diff --git a/test/unittests/Microsoft.ServiceFabric.Actors.StateMigration.Tests/Microsoft.ServiceFabric.Actors.StateMigration.Tests.csproj b/test/unittests/Microsoft.ServiceFabric.Actors.StateMigration.Tests/Microsoft.ServiceFabric.Actors.StateMigration.Tests.csproj index 44727204..f4940912 100644 --- a/test/unittests/Microsoft.ServiceFabric.Actors.StateMigration.Tests/Microsoft.ServiceFabric.Actors.StateMigration.Tests.csproj +++ b/test/unittests/Microsoft.ServiceFabric.Actors.StateMigration.Tests/Microsoft.ServiceFabric.Actors.StateMigration.Tests.csproj @@ -8,12 +8,12 @@ net9.0 - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -23,12 +23,4 @@ - - - - - diff --git a/test/unittests/Microsoft.ServiceFabric.Actors.Tests/Microsoft.ServiceFabric.Actors.Tests.csproj b/test/unittests/Microsoft.ServiceFabric.Actors.Tests/Microsoft.ServiceFabric.Actors.Tests.csproj index cbd286fe..26741696 100644 --- a/test/unittests/Microsoft.ServiceFabric.Actors.Tests/Microsoft.ServiceFabric.Actors.Tests.csproj +++ b/test/unittests/Microsoft.ServiceFabric.Actors.Tests/Microsoft.ServiceFabric.Actors.Tests.csproj @@ -8,12 +8,12 @@ net9.0 - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/unittests/Microsoft.ServiceFabric.Services.Remoting.Tests/Microsoft.ServiceFabric.Services.Remoting.Tests.csproj b/test/unittests/Microsoft.ServiceFabric.Services.Remoting.Tests/Microsoft.ServiceFabric.Services.Remoting.Tests.csproj index 133d3108..668ed8c1 100644 --- a/test/unittests/Microsoft.ServiceFabric.Services.Remoting.Tests/Microsoft.ServiceFabric.Services.Remoting.Tests.csproj +++ b/test/unittests/Microsoft.ServiceFabric.Services.Remoting.Tests/Microsoft.ServiceFabric.Services.Remoting.Tests.csproj @@ -9,11 +9,11 @@ true - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -24,6 +24,6 @@ - + diff --git a/test/unittests/Microsoft.ServiceFabric.Services.Tests/Microsoft.ServiceFabric.Services.Tests.csproj b/test/unittests/Microsoft.ServiceFabric.Services.Tests/Microsoft.ServiceFabric.Services.Tests.csproj index a65904a9..62cacc74 100644 --- a/test/unittests/Microsoft.ServiceFabric.Services.Tests/Microsoft.ServiceFabric.Services.Tests.csproj +++ b/test/unittests/Microsoft.ServiceFabric.Services.Tests/Microsoft.ServiceFabric.Services.Tests.csproj @@ -8,11 +8,11 @@ net9.0 - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive