diff --git a/GrandNode.sln b/GrandNode.sln index 20ae11d7c..c7d8738dc 100644 --- a/GrandNode.sln +++ b/GrandNode.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32014.148 +# Visual Studio Version 18 +VisualStudioVersion = 18.5.11619.145 insiders MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{FA350BD6-C29D-40D9-BA47-FE5FBDFC84A0}" EndProject @@ -147,16 +147,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "s EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grand.Web.AdminShared", "src\Web\Grand.Web.AdminShared\Grand.Web.AdminShared.csproj", "{12C4A556-E62E-4EC0-BCD9-E9D4E1F3D430}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grand.Mapping.Tests", "src\Tests\Grand.Mapping.Tests\Grand.Mapping.Tests.csproj", "{396E6929-5365-4116-8AA8-DF5327247798}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web", "Web", "{03997797-E7F5-0643-168D-B8EA7178C2FE}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{EC447DCF-ABFA-6E24-52A5-D7FD48A5C558}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Business", "Business", "{CC1F4FA2-92F2-BA4B-815B-7EC2CBBCCF50}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -964,9 +956,6 @@ Global {136F1E35-8B20-465C-8D42-30A5A0D0DA1F} = {583FFBBD-421C-4FB7-BBDA-F9CAF35A354A} {12C4A556-E62E-4EC0-BCD9-E9D4E1F3D430} = {BF4543A8-0731-4FDD-BB6B-0ADB9561F981} {396E6929-5365-4116-8AA8-DF5327247798} = {6360202A-F931-4BBD-ADBD-C9A628EE59F8} - {03997797-E7F5-0643-168D-B8EA7178C2FE} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B} - {EC447DCF-ABFA-6E24-52A5-D7FD48A5C558} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B} - {CC1F4FA2-92F2-BA4B-815B-7EC2CBBCCF50} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {88B478F4-FD3B-4C24-9E84-4FAAF0254397} diff --git a/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj b/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj index b32d2dfe9..533e45aeb 100644 --- a/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj +++ b/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj @@ -33,7 +33,10 @@ false - + + false + + false diff --git a/src/Plugins/Authentication.Google/Authentication.Google.csproj b/src/Plugins/Authentication.Google/Authentication.Google.csproj index ca0135aca..97d50367a 100644 --- a/src/Plugins/Authentication.Google/Authentication.Google.csproj +++ b/src/Plugins/Authentication.Google/Authentication.Google.csproj @@ -1,62 +1,65 @@  - - - true - false - - - ..\..\Web\Grand.Web\Plugins\Authentication.Google - $(OutputPath) - + + + true + false + + + ..\..\Web\Grand.Web\Plugins\Authentication.Google + $(OutputPath) + - - ..\..\Web\Grand.Web\Plugins\Authentication.Google - $(OutputPath) - + + ..\..\Web\Grand.Web\Plugins\Authentication.Google + $(OutputPath) + - - - + + + - - - - - - + + + + + + - - - false - - - false - - - false - - - false - - - false - all - - - false - - + + + false + + + false + + + false + + + false + + + false + + + false + all + + + false + + - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + diff --git a/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj b/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj index e8be89b4b..c130e63e8 100644 --- a/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj +++ b/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj @@ -1,45 +1,48 @@  - - - true - false - + + + true + false + - - ..\..\Web\Grand.Web\Plugins\DiscountRules.Standard - $(OutputPath) - + + ..\..\Web\Grand.Web\Plugins\DiscountRules.Standard + $(OutputPath) + - - ..\..\Web\Grand.Web\Plugins\DiscountRules.Standard - $(OutputPath) - + + ..\..\Web\Grand.Web\Plugins\DiscountRules.Standard + $(OutputPath) + - - - false - - - false - - - false - - - false - - - false - all - - - false - - - - - Always - - + + + false + + + false + + + false + + + false + + + false + + + false + all + + + false + + + + + Always + + \ No newline at end of file diff --git a/src/Plugins/ExchangeRate.McExchange/ExchangeRate.McExchange.csproj b/src/Plugins/ExchangeRate.McExchange/ExchangeRate.McExchange.csproj index 2368cd65a..b7a9486b8 100644 --- a/src/Plugins/ExchangeRate.McExchange/ExchangeRate.McExchange.csproj +++ b/src/Plugins/ExchangeRate.McExchange/ExchangeRate.McExchange.csproj @@ -21,6 +21,9 @@ false + + false + false diff --git a/src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj b/src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj index f67f87a10..0627e4182 100644 --- a/src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj +++ b/src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj @@ -35,6 +35,9 @@ false + + false + false diff --git a/src/Plugins/Payments.CashOnDelivery/Payments.CashOnDelivery.csproj b/src/Plugins/Payments.CashOnDelivery/Payments.CashOnDelivery.csproj index 198028a57..4476dc110 100644 --- a/src/Plugins/Payments.CashOnDelivery/Payments.CashOnDelivery.csproj +++ b/src/Plugins/Payments.CashOnDelivery/Payments.CashOnDelivery.csproj @@ -22,6 +22,9 @@ false + + false + false diff --git a/src/Plugins/Payments.StripeCheckout/Payments.StripeCheckout.csproj b/src/Plugins/Payments.StripeCheckout/Payments.StripeCheckout.csproj index 55a1cd0e6..e54f982b0 100644 --- a/src/Plugins/Payments.StripeCheckout/Payments.StripeCheckout.csproj +++ b/src/Plugins/Payments.StripeCheckout/Payments.StripeCheckout.csproj @@ -37,7 +37,10 @@ false - + + false + + false diff --git a/src/Plugins/Shipping.ByWeight/Shipping.ByWeight.csproj b/src/Plugins/Shipping.ByWeight/Shipping.ByWeight.csproj index ab9f7e987..e6e6277bc 100644 --- a/src/Plugins/Shipping.ByWeight/Shipping.ByWeight.csproj +++ b/src/Plugins/Shipping.ByWeight/Shipping.ByWeight.csproj @@ -25,6 +25,9 @@ false + + false + false diff --git a/src/Plugins/Shipping.FixedRateShipping/Shipping.FixedRateShipping.csproj b/src/Plugins/Shipping.FixedRateShipping/Shipping.FixedRateShipping.csproj index 5f05f2feb..e0eb36d3b 100644 --- a/src/Plugins/Shipping.FixedRateShipping/Shipping.FixedRateShipping.csproj +++ b/src/Plugins/Shipping.FixedRateShipping/Shipping.FixedRateShipping.csproj @@ -25,6 +25,9 @@ false + + false + false diff --git a/src/Plugins/Shipping.ShippingPoint/Shipping.ShippingPoint.csproj b/src/Plugins/Shipping.ShippingPoint/Shipping.ShippingPoint.csproj index e8496425b..164635d1d 100644 --- a/src/Plugins/Shipping.ShippingPoint/Shipping.ShippingPoint.csproj +++ b/src/Plugins/Shipping.ShippingPoint/Shipping.ShippingPoint.csproj @@ -25,6 +25,9 @@ false + + false + false diff --git a/src/Plugins/Tax.CountryStateZip/Tax.CountryStateZip.csproj b/src/Plugins/Tax.CountryStateZip/Tax.CountryStateZip.csproj index 93c278f6b..1bcf0371c 100644 --- a/src/Plugins/Tax.CountryStateZip/Tax.CountryStateZip.csproj +++ b/src/Plugins/Tax.CountryStateZip/Tax.CountryStateZip.csproj @@ -25,6 +25,9 @@ false + + false + false diff --git a/src/Plugins/Tax.FixedRate/Tax.FixedRate.csproj b/src/Plugins/Tax.FixedRate/Tax.FixedRate.csproj index 24b252df6..253057629 100644 --- a/src/Plugins/Tax.FixedRate/Tax.FixedRate.csproj +++ b/src/Plugins/Tax.FixedRate/Tax.FixedRate.csproj @@ -25,6 +25,9 @@ false + + false + false diff --git a/src/Plugins/Theme.Modern/Theme.Modern.csproj b/src/Plugins/Theme.Modern/Theme.Modern.csproj index 45362f30c..4763b7070 100644 --- a/src/Plugins/Theme.Modern/Theme.Modern.csproj +++ b/src/Plugins/Theme.Modern/Theme.Modern.csproj @@ -1,56 +1,59 @@ - - - true + + + true false - - ..\..\Web\Grand.Web\Plugins\Theme.Modern\ - $(OutputPath) - + + ..\..\Web\Grand.Web\Plugins\Theme.Modern\ + $(OutputPath) + + + + ..\..\Web\Grand.Web\Plugins\Theme.Modern\ + $(OutputPath) + - - ..\..\Web\Grand.Web\Plugins\Theme.Modern\ - $(OutputPath) - + + + false + + + false + + + false + + + false + + + false + + + false + + + false + all + + + false + all + + - - - false - - - false - - - false - - - false - - - false - - - false - all - - - false - all - - + + + + + + PreserveNewest + + + PreserveNewest + + - - - - - - PreserveNewest - - - PreserveNewest - - - diff --git a/src/Plugins/Widgets.FacebookPixel/Widgets.FacebookPixel.csproj b/src/Plugins/Widgets.FacebookPixel/Widgets.FacebookPixel.csproj index 0823655f9..ba5b7120b 100644 --- a/src/Plugins/Widgets.FacebookPixel/Widgets.FacebookPixel.csproj +++ b/src/Plugins/Widgets.FacebookPixel/Widgets.FacebookPixel.csproj @@ -25,6 +25,9 @@ false + + false + false diff --git a/src/Plugins/Widgets.GoogleAnalytics/Widgets.GoogleAnalytics.csproj b/src/Plugins/Widgets.GoogleAnalytics/Widgets.GoogleAnalytics.csproj index 38840924a..f7c53f599 100644 --- a/src/Plugins/Widgets.GoogleAnalytics/Widgets.GoogleAnalytics.csproj +++ b/src/Plugins/Widgets.GoogleAnalytics/Widgets.GoogleAnalytics.csproj @@ -25,6 +25,9 @@ false + + false + false diff --git a/src/Plugins/Widgets.Slider/Widgets.Slider.csproj b/src/Plugins/Widgets.Slider/Widgets.Slider.csproj index 721daf3b5..c416b24c4 100644 --- a/src/Plugins/Widgets.Slider/Widgets.Slider.csproj +++ b/src/Plugins/Widgets.Slider/Widgets.Slider.csproj @@ -25,6 +25,9 @@ false + + false + false