From 5bb4d0c823bf2901575a03ee3d59817b2bcdfbc9 Mon Sep 17 00:00:00 2001 From: Glenn <5834289+glennawatson@users.noreply.github.com> Date: Thu, 15 Feb 2024 20:49:23 +1100 Subject: [PATCH] Feature: Add central nuget packaging (#1073) --- src/Benchmarks/Directory.Packages.props | 32 +++++++ src/Benchmarks/Splat.Benchmarks.csproj | 8 +- src/Directory.Packages.props | 88 +++++++++++++++++++ src/Directory.build.props | 39 +++----- .../ReactiveUI.DI.Tests.csproj | 9 +- src/Splat.AppCenter/Splat.AppCenter.csproj | 10 +-- .../Splat.ApplicationInsights.csproj | 6 +- src/Splat.Autofac/Splat.Autofac.csproj | 8 +- .../Splat.Avalonia.Autofac.csproj | 8 +- .../Splat.Avalonia.DryIoc.csproj | 9 +- .../Splat.Avalonia.DryIoc1.Tests.csproj | 17 ++-- .../Splat.Avalonia.DryIoc2.Tests.csproj | 18 ++-- ...soft.Extensions.DependencyInjection.csproj | 10 +-- .../Splat.Avalonia.Microsoft1.Tests.csproj | 18 ++-- .../Splat.Avalonia.Microsoft2.Tests.csproj | 19 ++-- .../Splat.Avalonia.Ninject.csproj | 9 +- .../Splat.Avalonia.Tests.csproj | 15 ++-- src/Splat.Drawing/Splat.Drawing.csproj | 30 ++----- src/Splat.DryIoc/Splat.DryIoc.csproj | 6 +- .../Splat.Exceptionless.csproj | 8 +- src/Splat.Log4Net/Splat.Log4Net.csproj | 60 ++++++------- ...soft.Extensions.DependencyInjection.csproj | 8 +- .../Splat.Microsoft.Extensions.Logging.csproj | 6 +- src/Splat.NLog/Splat.NLog.csproj | 6 +- src/Splat.Ninject/Splat.Ninject.csproj | 8 +- .../Splat.Prism.Forms.csproj | 7 +- src/Splat.Prism/Splat.Prism.csproj | 7 +- src/Splat.Raygun/Splat.Raygun.csproj | 7 +- src/Splat.Serilog/Splat.Serilog.csproj | 6 +- .../Splat.SimpleInjector.csproj | 8 +- src/Splat.Tests/Splat.Tests.csproj | 8 +- 31 files changed, 245 insertions(+), 253 deletions(-) create mode 100644 src/Benchmarks/Directory.Packages.props create mode 100644 src/Directory.Packages.props diff --git a/src/Benchmarks/Directory.Packages.props b/src/Benchmarks/Directory.Packages.props new file mode 100644 index 000000000..58ae23039 --- /dev/null +++ b/src/Benchmarks/Directory.Packages.props @@ -0,0 +1,32 @@ + + + true + true + + + 2.0.0-rc4-build2924 + + + 1.7.0.1540 + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Benchmarks/Splat.Benchmarks.csproj b/src/Benchmarks/Splat.Benchmarks.csproj index 1e56aee88..b61021d37 100644 --- a/src/Benchmarks/Splat.Benchmarks.csproj +++ b/src/Benchmarks/Splat.Benchmarks.csproj @@ -1,5 +1,4 @@  - false net6.0 @@ -10,11 +9,10 @@ ;1591;1701;1702;1705;CA1822 - - + + - - + \ No newline at end of file diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props new file mode 100644 index 000000000..c540e0736 --- /dev/null +++ b/src/Directory.Packages.props @@ -0,0 +1,88 @@ + + + true + true + + + 11.0.9 + 19.5.41 + 2.6.6 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Directory.build.props b/src/Directory.build.props index 74d94c33f..cd22fd563 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -28,7 +28,6 @@ preview enable $(NoWarn);VSSpell001;SA1010 - false $(EnableSourceLink) @@ -40,55 +39,45 @@ $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb netstandard2.0;net6.0;net7.0;net8.0 net6.0-windows10.0.17763.0;net7.0-windows10.0.17763.0;net8.0-windows10.0.17763.0 - 11.0.7 false - Full - true - - - - - - - - + + + + + + + - - - - + + + - - + - $(MSBuildThisFileDirectory) - - - - - + + + - diff --git a/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj b/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj index 1ea860e93..64bcefe8d 100644 --- a/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj +++ b/src/ReactiveUI.DI.Tests/ReactiveUI.DI.Tests.csproj @@ -1,12 +1,10 @@ - net472;net6.0; $(NoWarn);1591;CA1707;SA1633;CA2000 false enable - @@ -25,14 +23,11 @@ - - + - - - + \ No newline at end of file diff --git a/src/Splat.AppCenter/Splat.AppCenter.csproj b/src/Splat.AppCenter/Splat.AppCenter.csproj index 3e897399a..17a2acd8d 100644 --- a/src/Splat.AppCenter/Splat.AppCenter.csproj +++ b/src/Splat.AppCenter/Splat.AppCenter.csproj @@ -1,5 +1,4 @@ - netstandard2.0;$(SplatWindowsTargetFrameworks) @@ -9,14 +8,11 @@ Visual Studio AppCenter integrations for Splat Splat.AppCenter - - - + + - - - + \ No newline at end of file diff --git a/src/Splat.ApplicationInsights/Splat.ApplicationInsights.csproj b/src/Splat.ApplicationInsights/Splat.ApplicationInsights.csproj index 99ddbe7ee..47fe933ce 100644 --- a/src/Splat.ApplicationInsights/Splat.ApplicationInsights.csproj +++ b/src/Splat.ApplicationInsights/Splat.ApplicationInsights.csproj @@ -9,11 +9,9 @@ Splat.ApplicationInsights - + - - - + \ No newline at end of file diff --git a/src/Splat.Autofac/Splat.Autofac.csproj b/src/Splat.Autofac/Splat.Autofac.csproj index 78a7dd384..c729e703f 100644 --- a/src/Splat.Autofac/Splat.Autofac.csproj +++ b/src/Splat.Autofac/Splat.Autofac.csproj @@ -1,17 +1,13 @@ - $(SplatTargetFrameworks) $(TargetFrameworks);net462 Autofac adapter for Splat - - + - - - + \ No newline at end of file diff --git a/src/Splat.Avalonia.Autofac/Splat.Avalonia.Autofac.csproj b/src/Splat.Avalonia.Autofac/Splat.Avalonia.Autofac.csproj index 783ef858d..c9672c272 100644 --- a/src/Splat.Avalonia.Autofac/Splat.Avalonia.Autofac.csproj +++ b/src/Splat.Avalonia.Autofac/Splat.Avalonia.Autofac.csproj @@ -1,5 +1,4 @@ - $(SplatTargetFrameworks) enable @@ -8,10 +7,9 @@ - - - + + - + \ No newline at end of file diff --git a/src/Splat.Avalonia.DryIoc/Splat.Avalonia.DryIoc.csproj b/src/Splat.Avalonia.DryIoc/Splat.Avalonia.DryIoc.csproj index 063c27783..fff888195 100644 --- a/src/Splat.Avalonia.DryIoc/Splat.Avalonia.DryIoc.csproj +++ b/src/Splat.Avalonia.DryIoc/Splat.Avalonia.DryIoc.csproj @@ -1,18 +1,15 @@ - $(SplatTargetFrameworks) enable enable - - - - + + - + \ No newline at end of file diff --git a/src/Splat.Avalonia.DryIoc1.Tests/Splat.Avalonia.DryIoc1.Tests.csproj b/src/Splat.Avalonia.DryIoc1.Tests/Splat.Avalonia.DryIoc1.Tests.csproj index 0a7137909..ff5efd36b 100644 --- a/src/Splat.Avalonia.DryIoc1.Tests/Splat.Avalonia.DryIoc1.Tests.csproj +++ b/src/Splat.Avalonia.DryIoc1.Tests/Splat.Avalonia.DryIoc1.Tests.csproj @@ -1,16 +1,13 @@ - net6.0 enable enable - $(NoWarn);1591;CA1707;SA1600;SA1601;SA1633;CA2000 false true $(DefineConstants);DRYIOC1 - Designer @@ -25,7 +22,6 @@ Designer - @@ -36,16 +32,13 @@ - - - - - - + + + + - - + \ No newline at end of file diff --git a/src/Splat.Avalonia.DryIoc2.Tests/Splat.Avalonia.DryIoc2.Tests.csproj b/src/Splat.Avalonia.DryIoc2.Tests/Splat.Avalonia.DryIoc2.Tests.csproj index b4bf549f7..ce607b530 100644 --- a/src/Splat.Avalonia.DryIoc2.Tests/Splat.Avalonia.DryIoc2.Tests.csproj +++ b/src/Splat.Avalonia.DryIoc2.Tests/Splat.Avalonia.DryIoc2.Tests.csproj @@ -1,16 +1,13 @@ - net7.0 enable enable - $(NoWarn);1591;CA1707;SA1600;SA1601;SA1633;CA2000 false true $(DefineConstants);DRYIOC2 - Designer @@ -25,7 +22,6 @@ Designer - @@ -36,23 +32,19 @@ - - - - - - - + + + + - - + \ No newline at end of file diff --git a/src/Splat.Avalonia.Microsoft.Extensions.DependencyInjection/Splat.Avalonia.Microsoft.Extensions.DependencyInjection.csproj b/src/Splat.Avalonia.Microsoft.Extensions.DependencyInjection/Splat.Avalonia.Microsoft.Extensions.DependencyInjection.csproj index 31dbdbcc0..2ca7ec4db 100644 --- a/src/Splat.Avalonia.Microsoft.Extensions.DependencyInjection/Splat.Avalonia.Microsoft.Extensions.DependencyInjection.csproj +++ b/src/Splat.Avalonia.Microsoft.Extensions.DependencyInjection/Splat.Avalonia.Microsoft.Extensions.DependencyInjection.csproj @@ -1,19 +1,15 @@ - $(SplatTargetFrameworks) enable enable - - - - + + - - + \ No newline at end of file diff --git a/src/Splat.Avalonia.Microsoft1.Tests/Splat.Avalonia.Microsoft1.Tests.csproj b/src/Splat.Avalonia.Microsoft1.Tests/Splat.Avalonia.Microsoft1.Tests.csproj index 74761cca1..eeb39bfd5 100644 --- a/src/Splat.Avalonia.Microsoft1.Tests/Splat.Avalonia.Microsoft1.Tests.csproj +++ b/src/Splat.Avalonia.Microsoft1.Tests/Splat.Avalonia.Microsoft1.Tests.csproj @@ -1,16 +1,13 @@ - net6.0 enable enable - $(NoWarn);1591;CA1707;SA1600;SA1601;SA1633;CA2000 false true $(DefineConstants);MICROSOFT1 - Designer @@ -25,7 +22,6 @@ Designer - @@ -36,24 +32,20 @@ - - - - - - + + + + - - - + \ No newline at end of file diff --git a/src/Splat.Avalonia.Microsoft2.Tests/Splat.Avalonia.Microsoft2.Tests.csproj b/src/Splat.Avalonia.Microsoft2.Tests/Splat.Avalonia.Microsoft2.Tests.csproj index 4721aee0a..1821d7868 100644 --- a/src/Splat.Avalonia.Microsoft2.Tests/Splat.Avalonia.Microsoft2.Tests.csproj +++ b/src/Splat.Avalonia.Microsoft2.Tests/Splat.Avalonia.Microsoft2.Tests.csproj @@ -1,16 +1,13 @@ - net7.0 enable enable - $(NoWarn);1591;CA1707;SA1600;SA1601;SA1633;CA2000 false true $(DefineConstants);MICROSOFT2 - Designer @@ -25,7 +22,6 @@ Designer - @@ -36,21 +32,16 @@ - - - - - - - - + + + + - - + \ No newline at end of file diff --git a/src/Splat.Avalonia.Ninject/Splat.Avalonia.Ninject.csproj b/src/Splat.Avalonia.Ninject/Splat.Avalonia.Ninject.csproj index a2b0425ea..b39ec95bb 100644 --- a/src/Splat.Avalonia.Ninject/Splat.Avalonia.Ninject.csproj +++ b/src/Splat.Avalonia.Ninject/Splat.Avalonia.Ninject.csproj @@ -1,18 +1,15 @@ - $(SplatTargetFrameworks) enable enable - - - - + + - + \ No newline at end of file diff --git a/src/Splat.Avalonia.Tests/Splat.Avalonia.Tests.csproj b/src/Splat.Avalonia.Tests/Splat.Avalonia.Tests.csproj index ef066c792..afe024e4e 100644 --- a/src/Splat.Avalonia.Tests/Splat.Avalonia.Tests.csproj +++ b/src/Splat.Avalonia.Tests/Splat.Avalonia.Tests.csproj @@ -1,28 +1,23 @@ - net6.0;net7.0 enable enable - $(NoWarn);1591;CA1707;SA1600;SA1601;SA1633;CA2000 false true $(DefineConstants);MAIN - - - - - - + + + + - - + \ No newline at end of file diff --git a/src/Splat.Drawing/Splat.Drawing.csproj b/src/Splat.Drawing/Splat.Drawing.csproj index eea0800fd..ef49f3f2c 100644 --- a/src/Splat.Drawing/Splat.Drawing.csproj +++ b/src/Splat.Drawing/Splat.Drawing.csproj @@ -1,5 +1,4 @@ - $(SplatTargetFrameworks);MonoAndroid13.0;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;Xamarin.WatchOS10;tizen40;net7.0-android;net7.0-ios;net7.0-tvos;net7.0-macos;net7.0-maccatalyst;net8.0-android;net8.0-ios;net8.0-tvos;net8.0-macos;net8.0-maccatalyst $(TargetFrameworks);net462;net472;$(SplatWindowsTargetFrameworks) @@ -10,16 +9,13 @@ $(NoWarn);1591 enable - true true - - @@ -28,7 +24,6 @@ - @@ -36,74 +31,61 @@ - - - - + + + - - - + - - + - - - - - - - - - - + \ No newline at end of file diff --git a/src/Splat.DryIoc/Splat.DryIoc.csproj b/src/Splat.DryIoc/Splat.DryIoc.csproj index 4b10f912d..cb7f0d29d 100644 --- a/src/Splat.DryIoc/Splat.DryIoc.csproj +++ b/src/Splat.DryIoc/Splat.DryIoc.csproj @@ -5,12 +5,10 @@ $(NoWarn);CA1801 DryIoc adapter for Splat - - + - - + \ No newline at end of file diff --git a/src/Splat.Exceptionless/Splat.Exceptionless.csproj b/src/Splat.Exceptionless/Splat.Exceptionless.csproj index 202c110f4..953b782dc 100644 --- a/src/Splat.Exceptionless/Splat.Exceptionless.csproj +++ b/src/Splat.Exceptionless/Splat.Exceptionless.csproj @@ -9,12 +9,10 @@ Splat.Exceptionless - - + + - - - + \ No newline at end of file diff --git a/src/Splat.Log4Net/Splat.Log4Net.csproj b/src/Splat.Log4Net/Splat.Log4Net.csproj index 22f91d09f..501b0f6b7 100644 --- a/src/Splat.Log4Net/Splat.Log4Net.csproj +++ b/src/Splat.Log4Net/Splat.Log4Net.csproj @@ -8,41 +8,37 @@ Log4Net integrations for Splat Splat.Log4Net - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + \ No newline at end of file diff --git a/src/Splat.Microsoft.Extensions.DependencyInjection/Splat.Microsoft.Extensions.DependencyInjection.csproj b/src/Splat.Microsoft.Extensions.DependencyInjection/Splat.Microsoft.Extensions.DependencyInjection.csproj index 16d5ea01f..633558b1d 100644 --- a/src/Splat.Microsoft.Extensions.DependencyInjection/Splat.Microsoft.Extensions.DependencyInjection.csproj +++ b/src/Splat.Microsoft.Extensions.DependencyInjection/Splat.Microsoft.Extensions.DependencyInjection.csproj @@ -1,16 +1,12 @@ - $(SplatTargetFrameworks) $(TargetFrameworks);net462 - - + - - - + \ No newline at end of file diff --git a/src/Splat.Microsoft.Extensions.Logging/Splat.Microsoft.Extensions.Logging.csproj b/src/Splat.Microsoft.Extensions.Logging/Splat.Microsoft.Extensions.Logging.csproj index 455f02c6e..a3e8fee1a 100644 --- a/src/Splat.Microsoft.Extensions.Logging/Splat.Microsoft.Extensions.Logging.csproj +++ b/src/Splat.Microsoft.Extensions.Logging/Splat.Microsoft.Extensions.Logging.csproj @@ -9,10 +9,10 @@ Splat.Microsoft.Extensions.Logging - - + + - + \ No newline at end of file diff --git a/src/Splat.NLog/Splat.NLog.csproj b/src/Splat.NLog/Splat.NLog.csproj index d44735287..52f3f8d6b 100644 --- a/src/Splat.NLog/Splat.NLog.csproj +++ b/src/Splat.NLog/Splat.NLog.csproj @@ -9,10 +9,10 @@ Splat.NLog - - + + - + \ No newline at end of file diff --git a/src/Splat.Ninject/Splat.Ninject.csproj b/src/Splat.Ninject/Splat.Ninject.csproj index f1c233f7f..4813c3c1a 100644 --- a/src/Splat.Ninject/Splat.Ninject.csproj +++ b/src/Splat.Ninject/Splat.Ninject.csproj @@ -1,17 +1,13 @@ - $(SplatTargetFrameworks) $(TargetFrameworks);net462 Autofac adapter for Splat - - + - - - + \ No newline at end of file diff --git a/src/Splat.Prism.Forms/Splat.Prism.Forms.csproj b/src/Splat.Prism.Forms/Splat.Prism.Forms.csproj index 5153b7ade..1e339169f 100644 --- a/src/Splat.Prism.Forms/Splat.Prism.Forms.csproj +++ b/src/Splat.Prism.Forms/Splat.Prism.Forms.csproj @@ -1,16 +1,13 @@ - $(SplatTargetFrameworks) $(TargetFrameworks);net462 Prism adapter for Splat including Xamarin Forms adapters. - - + - - + \ No newline at end of file diff --git a/src/Splat.Prism/Splat.Prism.csproj b/src/Splat.Prism/Splat.Prism.csproj index 0135389ef..6ff6f5676 100644 --- a/src/Splat.Prism/Splat.Prism.csproj +++ b/src/Splat.Prism/Splat.Prism.csproj @@ -1,16 +1,13 @@ - $(SplatTargetFrameworks) $(TargetFrameworks);net462 Prism adapter for Splat - - + - - + \ No newline at end of file diff --git a/src/Splat.Raygun/Splat.Raygun.csproj b/src/Splat.Raygun/Splat.Raygun.csproj index 58758c9ab..c31485c3c 100644 --- a/src/Splat.Raygun/Splat.Raygun.csproj +++ b/src/Splat.Raygun/Splat.Raygun.csproj @@ -1,5 +1,4 @@ - $(SplatTargetFrameworks) $(TargetFrameworks);net462 @@ -9,12 +8,10 @@ Raygun integrations for Splat Splat.Raygun - - + - - + \ No newline at end of file diff --git a/src/Splat.Serilog/Splat.Serilog.csproj b/src/Splat.Serilog/Splat.Serilog.csproj index d5f9ec9e5..11984d809 100644 --- a/src/Splat.Serilog/Splat.Serilog.csproj +++ b/src/Splat.Serilog/Splat.Serilog.csproj @@ -9,10 +9,10 @@ Splat.Serilog - - + + - + \ No newline at end of file diff --git a/src/Splat.SimpleInjector/Splat.SimpleInjector.csproj b/src/Splat.SimpleInjector/Splat.SimpleInjector.csproj index f552cc76c..bea3a7426 100644 --- a/src/Splat.SimpleInjector/Splat.SimpleInjector.csproj +++ b/src/Splat.SimpleInjector/Splat.SimpleInjector.csproj @@ -1,17 +1,13 @@ - $(SplatTargetFrameworks) $(TargetFrameworks);net462 SimpleInjector adapter for Splat - - + - - - + \ No newline at end of file diff --git a/src/Splat.Tests/Splat.Tests.csproj b/src/Splat.Tests/Splat.Tests.csproj index 1961bcb76..743a70961 100644 --- a/src/Splat.Tests/Splat.Tests.csproj +++ b/src/Splat.Tests/Splat.Tests.csproj @@ -1,15 +1,12 @@ - net6.0-windows10.0.17763.0;net7.0-windows10.0.17763.0;net8.0-windows10.0.17763.0 $(NoWarn);1591;CA1707;SA1633;CA2000;CA1034 enable - - + - @@ -22,7 +19,6 @@ - Always @@ -37,4 +33,4 @@ Always - + \ No newline at end of file