From 99ab70cf03974c9b3de528f11b11e02041941eeb Mon Sep 17 00:00:00 2001 From: bounav Date: Fri, 12 Nov 2021 14:35:14 +0000 Subject: [PATCH 1/5] Replaced package.config with ProjectReference - The Package.config files were missing from source control - Now using PackageReference element in .csproj file --- src/Spark.Tests/packages.config | 4 --- .../Spark.Web.Mvc.Pdf.Tests.csproj | 34 +++---------------- .../Spark.Web.Mvc.Pdf.csproj | 34 +++---------------- .../Spark.Web.Mvc.Python.csproj | 32 ++--------------- .../Spark.Web.Mvc.Ruby.Tests.csproj | 34 +++---------------- .../Spark.Web.Mvc.Ruby.csproj | 32 ++--------------- .../Spark.Web.Mvc.Tests.csproj | 34 +++---------------- src/Spark.Web.Mvc/Spark.Web.Mvc.csproj | 34 +++---------------- 8 files changed, 31 insertions(+), 207 deletions(-) delete mode 100644 src/Spark.Tests/packages.config diff --git a/src/Spark.Tests/packages.config b/src/Spark.Tests/packages.config deleted file mode 100644 index 26f795bb..00000000 --- a/src/Spark.Tests/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/Spark.Web.Mvc.Pdf.Tests/Spark.Web.Mvc.Pdf.Tests.csproj b/src/Spark.Web.Mvc.Pdf.Tests/Spark.Web.Mvc.Pdf.Tests.csproj index a4421f81..75ce52d5 100644 --- a/src/Spark.Web.Mvc.Pdf.Tests/Spark.Web.Mvc.Pdf.Tests.csproj +++ b/src/Spark.Web.Mvc.Pdf.Tests/Spark.Web.Mvc.Pdf.Tests.csproj @@ -55,10 +55,6 @@ false - - True - ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - False ..\..\bin\nunit\nunit.framework.dll @@ -72,30 +68,6 @@ 3.5 - - False - ..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll - - - False - ..\packages\Microsoft.AspNet.Mvc.5.2.2\lib\net45\System.Web.Mvc.dll - - - False - ..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll - - - False - ..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll - - - False - ..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll - - - False - ..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll - 3.5 @@ -129,7 +101,6 @@ - @@ -148,6 +119,11 @@ true + + + 5.2.7 + + + + + + + + \ No newline at end of file diff --git a/src/Castle.MonoRail.Views.Spark/Castle.MonoRail.Views.Spark.csproj b/src/Castle.MonoRail.Views.Spark/Castle.MonoRail.Views.Spark.csproj index f78e33a5..fa064048 100644 --- a/src/Castle.MonoRail.Views.Spark/Castle.MonoRail.Views.Spark.csproj +++ b/src/Castle.MonoRail.Views.Spark/Castle.MonoRail.Views.Spark.csproj @@ -1,23 +1,7 @@ - - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {33D786A4-C95D-473E-B96F-06EC68527F66} Library - Properties - Castle.MonoRail.Views.Spark - Castle.MonoRail.Views.Spark - v4.5 - 512 - false ..\SparkKey.snk - - - 3.5 - publish\ true Disk @@ -33,28 +17,11 @@ false false true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + + net45 + false AllRules.ruleset - false @@ -65,59 +32,29 @@ False ..\..\bin\castle\Castle.MonoRail.Framework.dll - - + 3.5 - - + 3.5 - - 3.5 - - - Properties\CommonAssemblyInfo.cs - - - - - - + Component - + PrecompileInstaller.cs - - - - - - - - - - - - - - - - - {31929D34-1A68-4A6B-9D8A-B93037163A5A} - Spark - + @@ -141,12 +78,7 @@ true - - + + + \ No newline at end of file diff --git a/src/Castle.Monorail.Pdf.Tests/Castle.Monorail.Pdf.Tests.csproj b/src/Castle.Monorail.Pdf.Tests/Castle.Monorail.Pdf.Tests.csproj index e8f1da7c..2a93b1cf 100644 --- a/src/Castle.Monorail.Pdf.Tests/Castle.Monorail.Pdf.Tests.csproj +++ b/src/Castle.Monorail.Pdf.Tests/Castle.Monorail.Pdf.Tests.csproj @@ -1,21 +1,7 @@ - - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {0FEC123E-DFD8-4DB0-9FC7-6C2EF2897FAD} + net45 Library - Properties - Castle.MonoRail.Pdf.Tests - Castle.MonoRail.Pdf.Tests - v4.5 - 512 - - - 3.5 - publish\ true Disk @@ -31,28 +17,8 @@ false false true - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + false AllRules.ruleset - false @@ -75,32 +41,20 @@ False ..\..\bin\rhinomocks\Rhino.Mocks.dll - - + 3.5 - + 3.5 - - 3.5 - - - Properties\CommonAssemblyInfo.cs - - - - - {D5796359-FF68-4444-809D-C7A8DAA92E41} - Castle.MonoRail.Pdf - + @@ -119,12 +73,7 @@ true - - + + + \ No newline at end of file diff --git a/src/Castle.Monorail.Pdf/Castle.Monorail.Pdf.csproj b/src/Castle.Monorail.Pdf/Castle.Monorail.Pdf.csproj index e308a021..0307f60b 100644 --- a/src/Castle.Monorail.Pdf/Castle.Monorail.Pdf.csproj +++ b/src/Castle.Monorail.Pdf/Castle.Monorail.Pdf.csproj @@ -1,23 +1,9 @@ - - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {D5796359-FF68-4444-809D-C7A8DAA92E41} + net45 Library - Properties - Castle.MonoRail.Pdf - Castle.MonoRail.Pdf - v4.5 - 512 true ..\SparkKey.snk - - - 3.5 - publish\ true Disk @@ -33,28 +19,8 @@ false false true - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + false AllRules.ruleset - false @@ -69,27 +35,17 @@ False ..\..\bin\itextsharp\itextsharp.dll - - + 3.5 - + 3.5 - - 3.5 - - - Properties\CommonAssemblyInfo.cs - - - - @@ -97,10 +53,7 @@ - - {31929D34-1A68-4A6B-9D8A-B93037163A5A} - Spark - + @@ -119,12 +72,7 @@ true - - + + + \ No newline at end of file diff --git a/src/Spark.Python.Tests/Spark.Python.Tests.csproj b/src/Spark.Python.Tests/Spark.Python.Tests.csproj index 71f0faca..9d834b18 100644 --- a/src/Spark.Python.Tests/Spark.Python.Tests.csproj +++ b/src/Spark.Python.Tests/Spark.Python.Tests.csproj @@ -1,21 +1,7 @@ - - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {ED1B2C7B-862B-4B11-9BC3-55B1887877D9} + net45 Library - Properties - Spark.Python.Tests - Spark.Python.Tests - v4.5 - 512 - - - 3.5 - publish\ true Disk @@ -31,28 +17,8 @@ false false true - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + false AllRules.ruleset - false @@ -71,41 +37,17 @@ False ..\..\bin\nunit\nunit.framework.dll - - + 3.5 - + 3.5 - - 3.5 - - - - - - - - - - - {0703F11D-FA13-4182-8577-170C9A5121FF} - Spark.Python - - - {64CC97B3-6B9B-4D12-8A45-5CD3621E6471} - Spark.Tests - - - {31929D34-1A68-4A6B-9D8A-B93037163A5A} - Spark - - - - + + + @@ -124,12 +66,7 @@ true - - + + + \ No newline at end of file diff --git a/src/Spark.Python/Spark.Python.csproj b/src/Spark.Python/Spark.Python.csproj index 59936dbf..6d850941 100644 --- a/src/Spark.Python/Spark.Python.csproj +++ b/src/Spark.Python/Spark.Python.csproj @@ -1,21 +1,7 @@ - - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {0703F11D-FA13-4182-8577-170C9A5121FF} + net45 Library - Properties - Spark.Python - Spark.Python - v4.5 - 512 - - - 3.5 - publish\ true Disk @@ -31,28 +17,8 @@ false false true - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + false AllRules.ruleset - false @@ -75,40 +41,20 @@ False ..\..\bin\ironpython\Microsoft.Scripting.ExtensionAttribute.dll - - + 3.5 - + 3.5 - - 3.5 - - - Properties\CommonAssemblyInfo.cs - - - - - - - - - - - - - {31929D34-1A68-4A6B-9D8A-B93037163A5A} - Spark - + @@ -127,12 +73,7 @@ true - - + + + \ No newline at end of file diff --git a/src/Spark.Ruby.Tests/Spark.Ruby.Tests.csproj b/src/Spark.Ruby.Tests/Spark.Ruby.Tests.csproj index 51439a62..8645b411 100644 --- a/src/Spark.Ruby.Tests/Spark.Ruby.Tests.csproj +++ b/src/Spark.Ruby.Tests/Spark.Ruby.Tests.csproj @@ -1,21 +1,7 @@ - - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {E4A60CC3-41B3-495E-AA77-2574621C863B} + net45 Library - Properties - Spark.Ruby.Tests - Spark.Ruby.Tests - v4.5 - 512 - - - 3.5 - publish\ true Disk @@ -31,28 +17,8 @@ false false true - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + false AllRules.ruleset - false @@ -75,37 +41,14 @@ False ..\..\bin\nunit\nunit.framework.dll - - + 3.5 - - 3.5 - - - - - - - - - - {514D7846-A133-4CCF-82B7-12C13F35D55B} - Spark.Ruby - - - {64CC97B3-6B9B-4D12-8A45-5CD3621E6471} - Spark.Tests - - - {31929D34-1A68-4A6B-9D8A-B93037163A5A} - Spark - - - - + + + @@ -124,12 +67,7 @@ true - - + + + \ No newline at end of file diff --git a/src/Spark.Ruby/Spark.Ruby.csproj b/src/Spark.Ruby/Spark.Ruby.csproj index 8b005222..f25135d9 100644 --- a/src/Spark.Ruby/Spark.Ruby.csproj +++ b/src/Spark.Ruby/Spark.Ruby.csproj @@ -1,21 +1,7 @@ - - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {514D7846-A133-4CCF-82B7-12C13F35D55B} + net45 Library - Properties - Spark.Ruby - Spark.Ruby - v4.5 - 512 - - - 3.5 - publish\ true Disk @@ -31,28 +17,8 @@ false false true - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + false AllRules.ruleset - false @@ -63,41 +29,20 @@ False ..\..\bin\ironruby\NonStandard.Microsoft.Scripting.dll - - - 3.5 - - + 3.5 - + 3.5 - - Properties\CommonAssemblyInfo.cs - - - - - - - - - - - - - - {31929D34-1A68-4A6B-9D8A-B93037163A5A} - Spark - + @@ -116,12 +61,10 @@ true - - + + + + + + \ No newline at end of file diff --git a/src/Spark.Tests/Spark.Tests.csproj b/src/Spark.Tests/Spark.Tests.csproj index d5087504..6050a3ae 100644 --- a/src/Spark.Tests/Spark.Tests.csproj +++ b/src/Spark.Tests/Spark.Tests.csproj @@ -1,21 +1,6 @@ - - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {64CC97B3-6B9B-4D12-8A45-5CD3621E6471} Library - Properties - Spark.Tests - Spark.Tests - v4.5 - 512 - - - 3.5 - publish\ true Disk @@ -31,28 +16,11 @@ false false true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + + net45 + false AllRules.ruleset - false @@ -63,270 +31,181 @@ False ..\..\bin\rhinomocks\Rhino.Mocks.dll - - ..\packages\Shouldly.1.1.1.0\lib\35\Shouldly.dll - - - + 3.5 - - 3.5 - - + 3.5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - {31929D34-1A68-4A6B-9D8A-B93037163A5A} - Spark - - - - - - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always Designer - + Always - + Always - + Always Designer - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + PreserveNewest - + PreserveNewest - + PreserveNewest - + Always @@ -340,161 +219,161 @@ Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always Designer - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always @@ -516,16 +395,15 @@ - + Always - - + + + + + + + \ No newline at end of file diff --git a/src/Spark.Web.Mvc.Pdf.Tests/Spark.Web.Mvc.Pdf.Tests.csproj b/src/Spark.Web.Mvc.Pdf.Tests/Spark.Web.Mvc.Pdf.Tests.csproj index 75ce52d5..e65df5f0 100644 --- a/src/Spark.Web.Mvc.Pdf.Tests/Spark.Web.Mvc.Pdf.Tests.csproj +++ b/src/Spark.Web.Mvc.Pdf.Tests/Spark.Web.Mvc.Pdf.Tests.csproj @@ -1,21 +1,6 @@ - - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {0799EE7A-58D3-467F-8DE6-8F3FFDDEF4A1} Library - Properties - Spark.Web.Mvc.Pdf.Tests - Spark.Web.Mvc.Pdf.Tests - v4.5 - 512 - - - 3.5 - publish\ true Disk @@ -31,28 +16,11 @@ false false true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + + net45 + false AllRules.ruleset - false @@ -63,44 +31,19 @@ False ..\..\bin\rhinomocks\Rhino.Mocks.dll - - + 3.5 - - 3.5 - - + 3.5 - - - - - - - - - - {0A90BB41-BE2E-4608-B5DB-A3A8A5269E2F} - Spark.Web.Mvc.Pdf - - - {C8E58F51-8630-4420-8630-8E634EC8900E} - Spark.Web.Mvc.Tests - - - {286050D6-95A1-4381-93D8-93381D8AB8E2} - Spark.Web.Mvc - - - {31929D34-1A68-4A6B-9D8A-B93037163A5A} - Spark - - + + + + @@ -123,13 +66,6 @@ 5.2.7 + - - \ No newline at end of file diff --git a/src/Spark.Web.Mvc.Pdf/Spark.Web.Mvc.Pdf.csproj b/src/Spark.Web.Mvc.Pdf/Spark.Web.Mvc.Pdf.csproj index e3b0e0ca..839d447a 100644 --- a/src/Spark.Web.Mvc.Pdf/Spark.Web.Mvc.Pdf.csproj +++ b/src/Spark.Web.Mvc.Pdf/Spark.Web.Mvc.Pdf.csproj @@ -1,23 +1,7 @@ - - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {0A90BB41-BE2E-4608-B5DB-A3A8A5269E2F} Library - Properties - Spark.Web.Mvc.Pdf - Spark.Web.Mvc.Pdf - v4.5 - 512 - false ..\SparkKey.snk - - - 3.5 - publish\ true Disk @@ -33,61 +17,28 @@ false false true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + + net45 + false AllRules.ruleset - false False ..\..\bin\itextsharp\itextsharp.dll - - + 3.5 - + 3.5 - - 3.5 - - - - - - - - - {286050D6-95A1-4381-93D8-93381D8AB8E2} - Spark.Web.Mvc - - - {31929D34-1A68-4A6B-9D8A-B93037163A5A} - Spark - + + @@ -118,13 +69,6 @@ 5.2.7 + - - \ No newline at end of file diff --git a/src/Spark.Web.Mvc.Python/Spark.Web.Mvc.Python.csproj b/src/Spark.Web.Mvc.Python/Spark.Web.Mvc.Python.csproj index 3673f5a4..a054e5ac 100644 --- a/src/Spark.Web.Mvc.Python/Spark.Web.Mvc.Python.csproj +++ b/src/Spark.Web.Mvc.Python/Spark.Web.Mvc.Python.csproj @@ -1,21 +1,7 @@ - - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {92156FC5-8ECF-4A52-B4CA-AE060DCAAD18} + net45 Library - Properties - Spark.Web.Mvc.Python - Spark.Web.Mvc.Python - v4.5 - 512 - - - 3.5 - publish\ true Disk @@ -31,68 +17,30 @@ false false true - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + false AllRules.ruleset - false False ..\..\bin\ironpython\Microsoft.Scripting.dll - - - 3.5 - - + 3.5 - + 3.5 - - Properties\CommonAssemblyInfo.cs - - - - - {0703F11D-FA13-4182-8577-170C9A5121FF} - Spark.Python - - - {286050D6-95A1-4381-93D8-93381D8AB8E2} - Spark.Web.Mvc - - - {31929D34-1A68-4A6B-9D8A-B93037163A5A} - Spark - + + + @@ -115,13 +63,6 @@ 5.2.7 + - - \ No newline at end of file diff --git a/src/Spark.Web.Mvc.Ruby.Tests/Spark.Web.Mvc.Ruby.Tests.csproj b/src/Spark.Web.Mvc.Ruby.Tests/Spark.Web.Mvc.Ruby.Tests.csproj index 33c6be91..d8d14eb7 100644 --- a/src/Spark.Web.Mvc.Ruby.Tests/Spark.Web.Mvc.Ruby.Tests.csproj +++ b/src/Spark.Web.Mvc.Ruby.Tests/Spark.Web.Mvc.Ruby.Tests.csproj @@ -1,21 +1,6 @@ - - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {AE1175DE-6388-472B-92EB-907A1C45E541} Library - Properties - Spark.Web.Mvc.Ruby.Tests - Spark.Web.Mvc.Ruby.Tests - v4.5 - 512 - - - 3.5 - publish\ true Disk @@ -31,28 +16,11 @@ false false true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + + net45 + false AllRules.ruleset - false @@ -63,40 +31,18 @@ False ..\..\bin\nunit\nunit.framework.dll - - + 3.5 - - 3.5 - - + 3.5 - - - - - - - - - - {514D7846-A133-4CCF-82B7-12C13F35D55B} - Spark.Ruby - - - {92D6EEC2-FFE5-48E5-BFE1-D5C6D2F48D90} - Spark.Web.Mvc.Ruby - - - {31929D34-1A68-4A6B-9D8A-B93037163A5A} - Spark - - + + + @@ -119,13 +65,6 @@ 5.2.7 + - - \ No newline at end of file diff --git a/src/Spark.Web.Mvc.Ruby/Spark.Web.Mvc.Ruby.csproj b/src/Spark.Web.Mvc.Ruby/Spark.Web.Mvc.Ruby.csproj index dfe0f850..edc3448a 100644 --- a/src/Spark.Web.Mvc.Ruby/Spark.Web.Mvc.Ruby.csproj +++ b/src/Spark.Web.Mvc.Ruby/Spark.Web.Mvc.Ruby.csproj @@ -1,21 +1,7 @@ - - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {92D6EEC2-FFE5-48E5-BFE1-D5C6D2F48D90} + net45 Library - Properties - Spark.Web.Mvc.Ruby - Spark.Web.Mvc.Ruby - v4.5 - 512 - - - 3.5 - publish\ true Disk @@ -31,28 +17,8 @@ false false true - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + false AllRules.ruleset - false @@ -63,40 +29,22 @@ False ..\..\bin\ironruby\NonStandard.Microsoft.Scripting.dll - - - 3.5 - - + 3.5 - + 3.5 - - Properties\CommonAssemblyInfo.cs - - - - - {514D7846-A133-4CCF-82B7-12C13F35D55B} - Spark.Ruby - - - {286050D6-95A1-4381-93D8-93381D8AB8E2} - Spark.Web.Mvc - - - {31929D34-1A68-4A6B-9D8A-B93037163A5A} - Spark - + + + @@ -119,13 +67,6 @@ 5.2.7 + - - \ No newline at end of file diff --git a/src/Spark.Web.Mvc.Tests/Spark.Web.Mvc.Tests.csproj b/src/Spark.Web.Mvc.Tests/Spark.Web.Mvc.Tests.csproj index ec59184e..eb6a81ad 100644 --- a/src/Spark.Web.Mvc.Tests/Spark.Web.Mvc.Tests.csproj +++ b/src/Spark.Web.Mvc.Tests/Spark.Web.Mvc.Tests.csproj @@ -1,21 +1,6 @@ - - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {C8E58F51-8630-4420-8630-8E634EC8900E} Library - Properties - Spark.Web.Mvc.Tests - Spark.Web.Mvc.Tests - v4.5 - 512 - - - 3.5 - publish\ true Disk @@ -31,31 +16,13 @@ false false true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + + net45 + false AllRules.ruleset - false - False ..\..\bin\nunit\nunit.framework.dll @@ -64,162 +31,134 @@ False ..\..\bin\rhinomocks\Rhino.Mocks.dll - - + 3.5 - + 3.5 - - 3.5 - - - - - - - - - - - - - - - - - - - - {286050D6-95A1-4381-93D8-93381D8AB8E2} - Spark.Web.Mvc - - - {31929D34-1A68-4A6B-9D8A-B93037163A5A} - Spark - + + - - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always @@ -244,13 +183,7 @@ 5.2.7 + + - - \ No newline at end of file diff --git a/src/Spark.Web.Mvc/Spark.Web.Mvc.csproj b/src/Spark.Web.Mvc/Spark.Web.Mvc.csproj index a08d39c1..4bdc030e 100644 --- a/src/Spark.Web.Mvc/Spark.Web.Mvc.csproj +++ b/src/Spark.Web.Mvc/Spark.Web.Mvc.csproj @@ -1,23 +1,7 @@ - - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {286050D6-95A1-4381-93D8-93381D8AB8E2} Library - Properties - Spark.Web.Mvc - Spark.Web.Mvc - v4.5 - 512 - false ..\SparkKey.snk - - - 3.5 - publish\ true Disk @@ -33,90 +17,36 @@ false false true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + + net45 + false AllRules.ruleset - false - - - + 3.5 - - - 3.5 - - + 3.5 - - Properties\CommonAssemblyInfo.cs - - - - - - - - - - - - - - - + Component - + PrecompileInstaller.cs - - - - - - - - - - - - - - {31929D34-1A68-4A6B-9D8A-B93037163A5A} - Spark - + @@ -144,13 +74,7 @@ 5.2.7 + + - - \ No newline at end of file diff --git a/src/Spark/Spark.csproj b/src/Spark/Spark.csproj index b3d23284..a109f438 100644 --- a/src/Spark/Spark.csproj +++ b/src/Spark/Spark.csproj @@ -1,23 +1,7 @@ - - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {31929D34-1A68-4A6B-9D8A-B93037163A5A} Library - Properties - Spark - Spark - v4.5 - 512 - false ..\SparkKey.snk - - - 3.5 - publish\ true Disk @@ -33,218 +17,26 @@ false false true - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - AllRules.ruleset - false true bin\Retail\ - DEBUG;TRACE - full - AnyCPU - prompt AllRules.ruleset - false - - + 3.5 - - 3.5 - - + 3.5 - - Properties\CommonAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -268,17 +60,17 @@ true - - - + + + + + + + + - - + net45 + false + AllRules.ruleset \ No newline at end of file diff --git a/src/Xpark/Xpark.csproj b/src/Xpark/Xpark.csproj index 132b2f97..d3de996d 100644 --- a/src/Xpark/Xpark.csproj +++ b/src/Xpark/Xpark.csproj @@ -1,21 +1,7 @@ - - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {4E7C0DEF-11F1-44C6-8CE0-198CD8FB8AB9} + net45 Exe - Properties - Xpark - Xpark - v4.5 - 512 - - - 3.5 - publish\ true Disk @@ -31,82 +17,47 @@ false false true - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + false AllRules.ruleset - false - - - 3.5 - - + 3.5 - + 3.5 - - - - - - - - - + Always - + Always - + Always - + Always - + Always - + Always - + Always - + Always - - {31929D34-1A68-4A6B-9D8A-B93037163A5A} - Spark - + @@ -125,12 +76,7 @@ true - - + + + \ No newline at end of file From 3bc0f8d32ab24ef7339b9dfee431fad09cc544a2 Mon Sep 17 00:00:00 2001 From: bounav Date: Fri, 12 Nov 2021 21:04:18 +0000 Subject: [PATCH 3/5] Updated solution file to visual studio 2019 --- src/Spark.sln | 57 ++++++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/src/Spark.sln b/src/Spark.sln index 3177751f..ccb7a0ed 100644 --- a/src/Spark.sln +++ b/src/Spark.sln @@ -1,5 +1,7 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31829.152 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Spark Core", "Spark Core", "{F606A062-1BD5-40E2-8E8A-BCC4F374BFBF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AspNet Mvc", "AspNet Mvc", "{F4E1F2B2-2BA6-4EFC-8082-ADBC14ECC179}" @@ -13,43 +15,43 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{8D3C4016-6843-4266-BA52-61D0A2C78880}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Castle.MonoRail.Views.Spark", "Castle.MonoRail.Views.Spark\Castle.MonoRail.Views.Spark.csproj", "{33D786A4-C95D-473E-B96F-06EC68527F66}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Castle.MonoRail.Views.Spark", "Castle.MonoRail.Views.Spark\Castle.MonoRail.Views.Spark.csproj", "{33D786A4-C95D-473E-B96F-06EC68527F66}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Castle.MonoRail.Views.Spark.Tests", "Castle.MonoRail.Views.Spark.Tests\Castle.MonoRail.Views.Spark.Tests.csproj", "{AD93C831-E12E-45AE-B654-682F9EFAE314}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Castle.MonoRail.Views.Spark.Tests", "Castle.MonoRail.Views.Spark.Tests\Castle.MonoRail.Views.Spark.Tests.csproj", "{AD93C831-E12E-45AE-B654-682F9EFAE314}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spark", "Spark\Spark.csproj", "{31929D34-1A68-4A6B-9D8A-B93037163A5A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark", "Spark\Spark.csproj", "{31929D34-1A68-4A6B-9D8A-B93037163A5A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spark.Tests", "Spark.Tests\Spark.Tests.csproj", "{64CC97B3-6B9B-4D12-8A45-5CD3621E6471}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark.Tests", "Spark.Tests\Spark.Tests.csproj", "{64CC97B3-6B9B-4D12-8A45-5CD3621E6471}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spark.Web.Mvc", "Spark.Web.Mvc\Spark.Web.Mvc.csproj", "{286050D6-95A1-4381-93D8-93381D8AB8E2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark.Web.Mvc", "Spark.Web.Mvc\Spark.Web.Mvc.csproj", "{286050D6-95A1-4381-93D8-93381D8AB8E2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spark.Web.Mvc.Tests", "Spark.Web.Mvc.Tests\Spark.Web.Mvc.Tests.csproj", "{C8E58F51-8630-4420-8630-8E634EC8900E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark.Web.Mvc.Tests", "Spark.Web.Mvc.Tests\Spark.Web.Mvc.Tests.csproj", "{C8E58F51-8630-4420-8630-8E634EC8900E}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spark.JsTests", "Spark.JsTests\Spark.JsTests.csproj", "{E3D6EDAD-3C8F-4C0D-AD96-740566A055F3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spark.Python", "Spark.Python\Spark.Python.csproj", "{0703F11D-FA13-4182-8577-170C9A5121FF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark.Python", "Spark.Python\Spark.Python.csproj", "{0703F11D-FA13-4182-8577-170C9A5121FF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spark.Python.Tests", "Spark.Python.Tests\Spark.Python.Tests.csproj", "{ED1B2C7B-862B-4B11-9BC3-55B1887877D9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark.Python.Tests", "Spark.Python.Tests\Spark.Python.Tests.csproj", "{ED1B2C7B-862B-4B11-9BC3-55B1887877D9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spark.Web.Mvc.Python", "Spark.Web.Mvc.Python\Spark.Web.Mvc.Python.csproj", "{92156FC5-8ECF-4A52-B4CA-AE060DCAAD18}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark.Web.Mvc.Python", "Spark.Web.Mvc.Python\Spark.Web.Mvc.Python.csproj", "{92156FC5-8ECF-4A52-B4CA-AE060DCAAD18}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spark.Ruby", "Spark.Ruby\Spark.Ruby.csproj", "{514D7846-A133-4CCF-82B7-12C13F35D55B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark.Ruby", "Spark.Ruby\Spark.Ruby.csproj", "{514D7846-A133-4CCF-82B7-12C13F35D55B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spark.Ruby.Tests", "Spark.Ruby.Tests\Spark.Ruby.Tests.csproj", "{E4A60CC3-41B3-495E-AA77-2574621C863B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark.Ruby.Tests", "Spark.Ruby.Tests\Spark.Ruby.Tests.csproj", "{E4A60CC3-41B3-495E-AA77-2574621C863B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spark.Web.Mvc.Ruby", "Spark.Web.Mvc.Ruby\Spark.Web.Mvc.Ruby.csproj", "{92D6EEC2-FFE5-48E5-BFE1-D5C6D2F48D90}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark.Web.Mvc.Ruby", "Spark.Web.Mvc.Ruby\Spark.Web.Mvc.Ruby.csproj", "{92D6EEC2-FFE5-48E5-BFE1-D5C6D2F48D90}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spark.Web.Mvc.Ruby.Tests", "Spark.Web.Mvc.Ruby.Tests\Spark.Web.Mvc.Ruby.Tests.csproj", "{AE1175DE-6388-472B-92EB-907A1C45E541}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark.Web.Mvc.Ruby.Tests", "Spark.Web.Mvc.Ruby.Tests\Spark.Web.Mvc.Ruby.Tests.csproj", "{AE1175DE-6388-472B-92EB-907A1C45E541}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xpark", "Xpark\Xpark.csproj", "{4E7C0DEF-11F1-44C6-8CE0-198CD8FB8AB9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xpark", "Xpark\Xpark.csproj", "{4E7C0DEF-11F1-44C6-8CE0-198CD8FB8AB9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spark.Web.Mvc.Pdf", "Spark.Web.Mvc.Pdf\Spark.Web.Mvc.Pdf.csproj", "{0A90BB41-BE2E-4608-B5DB-A3A8A5269E2F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark.Web.Mvc.Pdf", "Spark.Web.Mvc.Pdf\Spark.Web.Mvc.Pdf.csproj", "{0A90BB41-BE2E-4608-B5DB-A3A8A5269E2F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spark.Web.Mvc.Pdf.Tests", "Spark.Web.Mvc.Pdf.Tests\Spark.Web.Mvc.Pdf.Tests.csproj", "{0799EE7A-58D3-467F-8DE6-8F3FFDDEF4A1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark.Web.Mvc.Pdf.Tests", "Spark.Web.Mvc.Pdf.Tests\Spark.Web.Mvc.Pdf.Tests.csproj", "{0799EE7A-58D3-467F-8DE6-8F3FFDDEF4A1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Castle.MonoRail.Pdf", "Castle.Monorail.Pdf\Castle.MonoRail.Pdf.csproj", "{D5796359-FF68-4444-809D-C7A8DAA92E41}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Castle.MonoRail.Pdf", "Castle.Monorail.Pdf\Castle.MonoRail.Pdf.csproj", "{D5796359-FF68-4444-809D-C7A8DAA92E41}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Castle.MonoRail.Pdf.Tests", "Castle.Monorail.Pdf.Tests\Castle.MonoRail.Pdf.Tests.csproj", "{0FEC123E-DFD8-4DB0-9FC7-6C2EF2897FAD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Castle.MonoRail.Pdf.Tests", "Castle.Monorail.Pdf.Tests\Castle.MonoRail.Pdf.Tests.csproj", "{0FEC123E-DFD8-4DB0-9FC7-6C2EF2897FAD}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -138,24 +140,27 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution + {33D786A4-C95D-473E-B96F-06EC68527F66} = {CE293579-4889-4D6D-A1A0-BBBE8CBB9343} + {AD93C831-E12E-45AE-B654-682F9EFAE314} = {CE293579-4889-4D6D-A1A0-BBBE8CBB9343} {31929D34-1A68-4A6B-9D8A-B93037163A5A} = {F606A062-1BD5-40E2-8E8A-BCC4F374BFBF} {64CC97B3-6B9B-4D12-8A45-5CD3621E6471} = {F606A062-1BD5-40E2-8E8A-BCC4F374BFBF} + {286050D6-95A1-4381-93D8-93381D8AB8E2} = {F4E1F2B2-2BA6-4EFC-8082-ADBC14ECC179} + {C8E58F51-8630-4420-8630-8E634EC8900E} = {F4E1F2B2-2BA6-4EFC-8082-ADBC14ECC179} {E3D6EDAD-3C8F-4C0D-AD96-740566A055F3} = {F606A062-1BD5-40E2-8E8A-BCC4F374BFBF} {0703F11D-FA13-4182-8577-170C9A5121FF} = {F606A062-1BD5-40E2-8E8A-BCC4F374BFBF} {ED1B2C7B-862B-4B11-9BC3-55B1887877D9} = {F606A062-1BD5-40E2-8E8A-BCC4F374BFBF} + {92156FC5-8ECF-4A52-B4CA-AE060DCAAD18} = {F4E1F2B2-2BA6-4EFC-8082-ADBC14ECC179} {514D7846-A133-4CCF-82B7-12C13F35D55B} = {F606A062-1BD5-40E2-8E8A-BCC4F374BFBF} {E4A60CC3-41B3-495E-AA77-2574621C863B} = {F606A062-1BD5-40E2-8E8A-BCC4F374BFBF} - {286050D6-95A1-4381-93D8-93381D8AB8E2} = {F4E1F2B2-2BA6-4EFC-8082-ADBC14ECC179} - {C8E58F51-8630-4420-8630-8E634EC8900E} = {F4E1F2B2-2BA6-4EFC-8082-ADBC14ECC179} - {92156FC5-8ECF-4A52-B4CA-AE060DCAAD18} = {F4E1F2B2-2BA6-4EFC-8082-ADBC14ECC179} {92D6EEC2-FFE5-48E5-BFE1-D5C6D2F48D90} = {F4E1F2B2-2BA6-4EFC-8082-ADBC14ECC179} {AE1175DE-6388-472B-92EB-907A1C45E541} = {F4E1F2B2-2BA6-4EFC-8082-ADBC14ECC179} + {4E7C0DEF-11F1-44C6-8CE0-198CD8FB8AB9} = {8D3C4016-6843-4266-BA52-61D0A2C78880} {0A90BB41-BE2E-4608-B5DB-A3A8A5269E2F} = {F4E1F2B2-2BA6-4EFC-8082-ADBC14ECC179} {0799EE7A-58D3-467F-8DE6-8F3FFDDEF4A1} = {F4E1F2B2-2BA6-4EFC-8082-ADBC14ECC179} - {33D786A4-C95D-473E-B96F-06EC68527F66} = {CE293579-4889-4D6D-A1A0-BBBE8CBB9343} - {AD93C831-E12E-45AE-B654-682F9EFAE314} = {CE293579-4889-4D6D-A1A0-BBBE8CBB9343} {D5796359-FF68-4444-809D-C7A8DAA92E41} = {CE293579-4889-4D6D-A1A0-BBBE8CBB9343} {0FEC123E-DFD8-4DB0-9FC7-6C2EF2897FAD} = {CE293579-4889-4D6D-A1A0-BBBE8CBB9343} - {4E7C0DEF-11F1-44C6-8CE0-198CD8FB8AB9} = {8D3C4016-6843-4266-BA52-61D0A2C78880} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {B9FB0A1C-BC73-4CE6-95F0-9D33AE572BED} EndGlobalSection EndGlobal From 827c7a7e20e7e072268f33f870d3f26637758aa1 Mon Sep 17 00:00:00 2001 From: bounav Date: Wed, 30 Mar 2022 21:25:49 +0100 Subject: [PATCH 4/5] Changed msbuild path to visual studio 2019 --- spark.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spark.build b/spark.build index 02c61eb9..93d6b3ab 100644 --- a/spark.build +++ b/spark.build @@ -8,7 +8,7 @@ - + From df73e4cc3a757ee260b6ab411bd452bdfa545bf5 Mon Sep 17 00:00:00 2001 From: bounav Date: Wed, 30 Mar 2022 21:26:32 +0100 Subject: [PATCH 5/5] Ignoring src/.vs folder --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3882ca11..ec737a76 100644 --- a/.gitignore +++ b/.gitignore @@ -38,10 +38,11 @@ src/Tools/SparkLanguagePackage/*_i.c src/Tools/SparkLanguagePackage/*_i.h src/Tools/SparkLanguagePackage/*_p.c src/Tools/SparkLanguagePackage/PackageLoadKey.h +src/.vs #NuGet packages/ #ncrunch *ncrunch* -*crunch*.local.xml \ No newline at end of file +*crunch*.local.xml