From efdf9c90d653c40963d588efe03ab29238de7393 Mon Sep 17 00:00:00 2001 From: Andrew Fogarty Date: Mon, 22 Aug 2022 13:12:37 -0400 Subject: [PATCH 1/4] Update system packages --- .../Microsoft.Spark.FSharp.Examples.fsproj | 4 ++++ .../Microsoft.Spark.UnitTest/Microsoft.Spark.UnitTest.csproj | 2 +- .../Microsoft.Spark.Worker/Microsoft.Spark.Worker.csproj | 2 +- src/csharp/Microsoft.Spark/Microsoft.Spark.csproj | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/examples/Microsoft.Spark.FSharp.Examples/Microsoft.Spark.FSharp.Examples.fsproj b/examples/Microsoft.Spark.FSharp.Examples/Microsoft.Spark.FSharp.Examples.fsproj index 85ea23e1c..530191da7 100644 --- a/examples/Microsoft.Spark.FSharp.Examples/Microsoft.Spark.FSharp.Examples.fsproj +++ b/examples/Microsoft.Spark.FSharp.Examples/Microsoft.Spark.FSharp.Examples.fsproj @@ -24,4 +24,8 @@ + + + + diff --git a/src/csharp/Microsoft.Spark.UnitTest/Microsoft.Spark.UnitTest.csproj b/src/csharp/Microsoft.Spark.UnitTest/Microsoft.Spark.UnitTest.csproj index c65b6be69..20f2dab03 100644 --- a/src/csharp/Microsoft.Spark.UnitTest/Microsoft.Spark.UnitTest.csproj +++ b/src/csharp/Microsoft.Spark.UnitTest/Microsoft.Spark.UnitTest.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/csharp/Microsoft.Spark.Worker/Microsoft.Spark.Worker.csproj b/src/csharp/Microsoft.Spark.Worker/Microsoft.Spark.Worker.csproj index edb479b23..841a288ea 100644 --- a/src/csharp/Microsoft.Spark.Worker/Microsoft.Spark.Worker.csproj +++ b/src/csharp/Microsoft.Spark.Worker/Microsoft.Spark.Worker.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/csharp/Microsoft.Spark/Microsoft.Spark.csproj b/src/csharp/Microsoft.Spark/Microsoft.Spark.csproj index 68ae4d758..b2ecec03d 100644 --- a/src/csharp/Microsoft.Spark/Microsoft.Spark.csproj +++ b/src/csharp/Microsoft.Spark/Microsoft.Spark.csproj @@ -29,11 +29,11 @@ - + - + From 3be98c81bf167209a0d6babe431f1f2508ce72a0 Mon Sep 17 00:00:00 2001 From: Andrew Fogarty Date: Mon, 22 Aug 2022 13:18:50 -0400 Subject: [PATCH 2/4] Update newtonsoft --- src/csharp/Microsoft.Spark/Microsoft.Spark.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/csharp/Microsoft.Spark/Microsoft.Spark.csproj b/src/csharp/Microsoft.Spark/Microsoft.Spark.csproj index b2ecec03d..40f894ffa 100644 --- a/src/csharp/Microsoft.Spark/Microsoft.Spark.csproj +++ b/src/csharp/Microsoft.Spark/Microsoft.Spark.csproj @@ -31,7 +31,7 @@ - + From 4c3b4ae18368e6bfc95024c98603969bffc64c52 Mon Sep 17 00:00:00 2001 From: Andrew Fogarty Date: Mon, 22 Aug 2022 14:22:47 -0400 Subject: [PATCH 3/4] Update ML deps --- .../Microsoft.Spark.CSharp.Examples.csproj | 2 +- src/csharp/Microsoft.Spark/Microsoft.Spark.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/Microsoft.Spark.CSharp.Examples/Microsoft.Spark.CSharp.Examples.csproj b/examples/Microsoft.Spark.CSharp.Examples/Microsoft.Spark.CSharp.Examples.csproj index 5f54d77a1..d50fd605a 100644 --- a/examples/Microsoft.Spark.CSharp.Examples/Microsoft.Spark.CSharp.Examples.csproj +++ b/examples/Microsoft.Spark.CSharp.Examples/Microsoft.Spark.CSharp.Examples.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/csharp/Microsoft.Spark/Microsoft.Spark.csproj b/src/csharp/Microsoft.Spark/Microsoft.Spark.csproj index 40f894ffa..4be394ae0 100644 --- a/src/csharp/Microsoft.Spark/Microsoft.Spark.csproj +++ b/src/csharp/Microsoft.Spark/Microsoft.Spark.csproj @@ -30,7 +30,7 @@ - + From 5b2322a225a1463b8b8bea22bbdb7c7ea49b2b7e Mon Sep 17 00:00:00 2001 From: Andrew Fogarty Date: Fri, 17 Feb 2023 17:23:01 -0500 Subject: [PATCH 4/4] Add the rest of the dependencies --- .../Microsoft.Spark.CSharp.Examples.csproj | 2 +- .../Microsoft.Spark.FSharp.Examples.fsproj | 1 + .../Microsoft.Spark.Extensions.Delta.E2ETest.csproj | 6 ++++++ ...t.Spark.Extensions.DotNet.Interactive.UnitTest.csproj | 9 ++++++++- .../Microsoft.Spark.Extensions.Hyperspace.E2ETest.csproj | 6 ++++++ .../Microsoft.Spark.E2ETest.csproj | 6 ++++++ .../Microsoft.Spark.UnitTest.csproj | 9 ++++++++- .../Microsoft.Spark.Worker.UnitTest.csproj | 8 +++++++- src/csharp/Microsoft.Spark/Microsoft.Spark.csproj | 6 +++--- 9 files changed, 46 insertions(+), 7 deletions(-) diff --git a/examples/Microsoft.Spark.CSharp.Examples/Microsoft.Spark.CSharp.Examples.csproj b/examples/Microsoft.Spark.CSharp.Examples/Microsoft.Spark.CSharp.Examples.csproj index 4be3d477b..c08661866 100644 --- a/examples/Microsoft.Spark.CSharp.Examples/Microsoft.Spark.CSharp.Examples.csproj +++ b/examples/Microsoft.Spark.CSharp.Examples/Microsoft.Spark.CSharp.Examples.csproj @@ -13,7 +13,7 @@ - + diff --git a/examples/Microsoft.Spark.FSharp.Examples/Microsoft.Spark.FSharp.Examples.fsproj b/examples/Microsoft.Spark.FSharp.Examples/Microsoft.Spark.FSharp.Examples.fsproj index 61c6b55b6..7bdb11419 100644 --- a/examples/Microsoft.Spark.FSharp.Examples/Microsoft.Spark.FSharp.Examples.fsproj +++ b/examples/Microsoft.Spark.FSharp.Examples/Microsoft.Spark.FSharp.Examples.fsproj @@ -25,6 +25,7 @@ + diff --git a/src/csharp/Extensions/Microsoft.Spark.Extensions.Delta.E2ETest/Microsoft.Spark.Extensions.Delta.E2ETest.csproj b/src/csharp/Extensions/Microsoft.Spark.Extensions.Delta.E2ETest/Microsoft.Spark.Extensions.Delta.E2ETest.csproj index 393813db4..b1301a3e1 100644 --- a/src/csharp/Extensions/Microsoft.Spark.Extensions.Delta.E2ETest/Microsoft.Spark.Extensions.Delta.E2ETest.csproj +++ b/src/csharp/Extensions/Microsoft.Spark.Extensions.Delta.E2ETest/Microsoft.Spark.Extensions.Delta.E2ETest.csproj @@ -7,4 +7,10 @@ + + + all + runtime; build; native; contentfiles; analyzers + + diff --git a/src/csharp/Extensions/Microsoft.Spark.Extensions.DotNet.Interactive.UnitTest/Microsoft.Spark.Extensions.DotNet.Interactive.UnitTest.csproj b/src/csharp/Extensions/Microsoft.Spark.Extensions.DotNet.Interactive.UnitTest/Microsoft.Spark.Extensions.DotNet.Interactive.UnitTest.csproj index bd592374e..6c5189169 100644 --- a/src/csharp/Extensions/Microsoft.Spark.Extensions.DotNet.Interactive.UnitTest/Microsoft.Spark.Extensions.DotNet.Interactive.UnitTest.csproj +++ b/src/csharp/Extensions/Microsoft.Spark.Extensions.DotNet.Interactive.UnitTest/Microsoft.Spark.Extensions.DotNet.Interactive.UnitTest.csproj @@ -6,7 +6,7 @@ - + @@ -18,5 +18,12 @@ + + + + all + runtime; build; native; contentfiles; analyzers + + diff --git a/src/csharp/Extensions/Microsoft.Spark.Extensions.Hyperspace.E2ETest/Microsoft.Spark.Extensions.Hyperspace.E2ETest.csproj b/src/csharp/Extensions/Microsoft.Spark.Extensions.Hyperspace.E2ETest/Microsoft.Spark.Extensions.Hyperspace.E2ETest.csproj index 7de956704..2c3ecc92d 100644 --- a/src/csharp/Extensions/Microsoft.Spark.Extensions.Hyperspace.E2ETest/Microsoft.Spark.Extensions.Hyperspace.E2ETest.csproj +++ b/src/csharp/Extensions/Microsoft.Spark.Extensions.Hyperspace.E2ETest/Microsoft.Spark.Extensions.Hyperspace.E2ETest.csproj @@ -7,4 +7,10 @@ + + + all + runtime; build; native; contentfiles; analyzers + + diff --git a/src/csharp/Microsoft.Spark.E2ETest/Microsoft.Spark.E2ETest.csproj b/src/csharp/Microsoft.Spark.E2ETest/Microsoft.Spark.E2ETest.csproj index b9e2bedd8..2798e95f4 100644 --- a/src/csharp/Microsoft.Spark.E2ETest/Microsoft.Spark.E2ETest.csproj +++ b/src/csharp/Microsoft.Spark.E2ETest/Microsoft.Spark.E2ETest.csproj @@ -20,4 +20,10 @@ + + + all + runtime; build; native; contentfiles; analyzers + + \ No newline at end of file diff --git a/src/csharp/Microsoft.Spark.UnitTest/Microsoft.Spark.UnitTest.csproj b/src/csharp/Microsoft.Spark.UnitTest/Microsoft.Spark.UnitTest.csproj index 6060d2f6f..0e83daa4f 100644 --- a/src/csharp/Microsoft.Spark.UnitTest/Microsoft.Spark.UnitTest.csproj +++ b/src/csharp/Microsoft.Spark.UnitTest/Microsoft.Spark.UnitTest.csproj @@ -6,7 +6,7 @@ - + @@ -14,4 +14,11 @@ + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/src/csharp/Microsoft.Spark.Worker.UnitTest/Microsoft.Spark.Worker.UnitTest.csproj b/src/csharp/Microsoft.Spark.Worker.UnitTest/Microsoft.Spark.Worker.UnitTest.csproj index 9e06e5ca8..33378946e 100644 --- a/src/csharp/Microsoft.Spark.Worker.UnitTest/Microsoft.Spark.Worker.UnitTest.csproj +++ b/src/csharp/Microsoft.Spark.Worker.UnitTest/Microsoft.Spark.Worker.UnitTest.csproj @@ -3,7 +3,7 @@ net6.0 - + @@ -14,4 +14,10 @@ + + + all + runtime; build; native; contentfiles; analyzers + + \ No newline at end of file diff --git a/src/csharp/Microsoft.Spark/Microsoft.Spark.csproj b/src/csharp/Microsoft.Spark/Microsoft.Spark.csproj index 4be394ae0..7c4b874b2 100644 --- a/src/csharp/Microsoft.Spark/Microsoft.Spark.csproj +++ b/src/csharp/Microsoft.Spark/Microsoft.Spark.csproj @@ -28,10 +28,10 @@ - + - - + +