Modify licensing to support new individual products

Author: mythz

src/ServiceStack.Text/LicenseUtils.cs

@@ -20,9 +20,12 @@ public enum LicenseType
         Indie,
         Business,
         Enterprise,
-        Text,
-        OrmLite,
-        Redis
+        TextIndie,
+        TextBusiness,
+        OrmLiteIndie,
+        OrmLiteBusiness,
+        RedisIndie,
+        RedisBusiness,
     }
 
     [Flags]
@@ -33,9 +36,6 @@ public enum LicenseFeature : long
         RedisSku = Redis | Text,
         OrmLiteSku = OrmLite | Text,
         Free = None,
-        Indie = All,
-        Business = All,
-        Enterprise = All,
         Premium = 1 << 0,
         Text = 1 << 1,
         Client = 1 << 2,
@@ -286,18 +286,23 @@ public static LicenseFeature GetLicensedFeatures(this LicenseKey key)
             {
                 case LicenseType.Free:
                     return LicenseFeature.Free;
+                
                 case LicenseType.Indie:
-                    return LicenseFeature.Indie;
                 case LicenseType.Business:
-                    return LicenseFeature.Business;
                 case LicenseType.Enterprise:
-                    return LicenseFeature.Enterprise;
-                case LicenseType.Text:
+                    return LicenseFeature.All;
+
+                case LicenseType.TextIndie:
+                case LicenseType.TextBusiness:
                     return LicenseFeature.Text;
-                case LicenseType.OrmLite:
-                    return LicenseFeature.OrmLite;
-                case LicenseType.Redis:
-                    return LicenseFeature.Redis;
+                
+                case LicenseType.OrmLiteIndie:
+                case LicenseType.OrmLiteBusiness:
+                    return LicenseFeature.OrmLiteSku;
+                
+                case LicenseType.RedisIndie:
+                case LicenseType.RedisBusiness:
+                    return LicenseFeature.RedisSku;
             }
             throw new ArgumentException("Unknown License Type: " + key.Type);
         }

src/ServiceStack.Text/ServiceStack.Text.csproj

@@ -71,21 +71,16 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
+    <Reference Include="System.Core" />
     <Reference Include="System.Data.Linq" />
-    <Reference Include="System.Runtime.Serialization">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>

tests/ServiceStack.Text.Tests/LicensingTests.cs

@@ -32,8 +32,8 @@ public class LicensingTests
         readonly LicenseKey TestBusiness2013 = new LicenseKey { Ref = "1001", Name = "Test Business", Type = LicenseType.Business, Expiry = new DateTime(2013, 01, 01) };
         const string TestIndie2013Text = "1001-e1JlZjoxMDAxLE5hbWU6VGVzdCBJbmRpZSxUeXBlOkluZGllLEhhc2g6UGJyTWlRL205YkpCN3NoUGFBelZKVkppZERHRjQwK2JiVWpvOWtrLzgrTUF3UmZZOE0rUkNHMTRYZ055S2ZFT29aNDY4c0FXS2dLRGlVZzEvVmViNjN5M2FpNTh5T2JTZ3RIL2tEdzhDL1VFOEZrazRhMEMrdEtNVU4xQlFxVHBEU21HQUZESUxuOHQ1M2lFWE9tK014MWZCNFEvbitFQUJTMVhvbjBlUE1zPSxFeHBpcnk6MjAxNC0wMS0wMX0=";
         readonly LicenseKey TestIndie2013 = new LicenseKey { Ref = "1001", Name = "Test Indie", Type = LicenseType.Indie, Expiry = new DateTime(2014, 01, 01) };
-        const string TestText2013Text = "1001-e1JlZjoxMDAxLE5hbWU6VGVzdCBUZXh0LFR5cGU6VGV4dCxIYXNoOkppVjBGdmxMcmRxa3hsN3BiZGFmK3BTc1BHak53QS9Ha245ejJ6dklOUkIwZGpOS2xXNzl0WTdZWWhLN1NRYk1WMXNyOUVyUE1DRGZzVXZ6N2tlcGl6ZzF0QkZ4eXNPb3NFUlJkdzZUM05uY1ZKRW1JTzFSSlpEOC85R2FsakZRQzJIYXFHMTl4ejF6V0NiNzFCM05BbzZOS0tLMW9Rc3QzZitENzI2YXgwST0sRXhwaXJ5OjIwMTMtMDEtMDF9";
-        readonly LicenseKey TestText2013 = new LicenseKey { Ref = "1001", Name = "Test Text", Type = LicenseType.Text, Expiry = new DateTime(2013, 01, 01) };
+        const string TestText2013Text = "1001-e1JlZjoxMDAxLE5hbWU6VGVzdCBUZXh0LFR5cGU6VGV4dEluZGllLEhhc2g6V3liaFpUejZiMWgxTGhCcmRRSzlNc09FVUsya3Z6Z2E5VDBaRCtEWnlBd0JxM1dabVFVanNaelgwTWR5OXJMSTlmbzJ0dVVOMk9iZ2srcmswdVZGeit6Q1dreTk3SFE5OHhkOGtDRkx0LzQxR2RiU054SnFIVUlmR1hMdS9CQTVOR0lKanN3SjhXTjdyY0R0VmYyTllKK2dEaFd1RzZ4cnB1ZXhYa01WSXFrPSxFeHBpcnk6MjAxMy0wMS0wMX0=";
+        readonly LicenseKey TestText2013 = new LicenseKey { Ref = "1001", Name = "Test Text", Type = LicenseType.TextIndie, Expiry = new DateTime(2013, 01, 01) };
 
         public IEnumerable AllLicenseUseCases
         {
@@ -99,10 +99,10 @@ public void Can_register_Text_License()
         public void Can_register_valid_licenses()
         {
             Licensing.RegisterLicense(TestBusiness2013Text);
-            Assert.That(LicenseUtils.ActivatedLicenseFeatures(), Is.EqualTo(LicenseFeature.Business));
+            Assert.That(LicenseUtils.ActivatedLicenseFeatures(), Is.EqualTo(LicenseFeature.All));
 
             Licensing.RegisterLicense(TestIndie2013Text);
-            Assert.That(LicenseUtils.ActivatedLicenseFeatures(), Is.EqualTo(LicenseFeature.Indie));
+            Assert.That(LicenseUtils.ActivatedLicenseFeatures(), Is.EqualTo(LicenseFeature.All));
         }
 
         [Test]
@@ -113,7 +113,7 @@ public void Can_register_valid_license()
 #else
             Licensing.RegisterLicense("1001-e1JlZjoxMDAxLE5hbWU6VGVzdCBCdXNpbmVzcyxUeXBlOkJ1c2luZXNzLEhhc2g6UHVNTVRPclhvT2ZIbjQ5MG5LZE1mUTd5RUMzQnBucTFEbTE3TDczVEF4QUNMT1FhNXJMOWkzVjFGL2ZkVTE3Q2pDNENqTkQyUktRWmhvUVBhYTBiekJGUUZ3ZE5aZHFDYm9hL3lydGlwUHI5K1JsaTBYbzNsUC85cjVJNHE5QVhldDN6QkE4aTlvdldrdTgyTk1relY2eis2dFFqTThYN2lmc0JveHgycFdjPSxFeHBpcnk6MjAxMy0wMS0wMX0=");
 #endif
-            Assert.That(LicenseUtils.ActivatedLicenseFeatures(), Is.EqualTo(LicenseFeature.Business));
+            Assert.That(LicenseUtils.ActivatedLicenseFeatures(), Is.EqualTo(LicenseFeature.All));
         }
 
         [Test]