[FSSDK-8663] chore: General clean up before ticket work (#367)

* Fix Rider-identified problems * Fix invalid AssemblyFileVersion as noted by GitHub * Remove unused field * Remove App_Data from proj * Upgrade Newtonsoft.Json for vulnerability in Demo & Test projs Now matching other projs at 13.0.2 * Code review changes
optimizely · Aug 16, 2023 · bfe4e64 · bfe4e64
1 parent f3a21d5
commit bfe4e64
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 48 deletions.
diff --git a/OptimizelySDK.DemoApp/OptimizelySDK.DemoApp.csproj b/OptimizelySDK.DemoApp/OptimizelySDK.DemoApp.csproj
@@ -65,8 +65,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -249,9 +248,6 @@
     <Content Include="Scripts\popper-utils.min.js.map" />
     <Content Include="Scripts\popper-utils.js.map" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="App_Data\" />
-  </ItemGroup>
   <ItemGroup>
     <Content Include="packages.config" />
   </ItemGroup>

diff --git a/OptimizelySDK.DemoApp/Views/Shared/_Layout.cshtml b/OptimizelySDK.DemoApp/Views/Shared/_Layout.cshtml
@@ -1,12 +1,12 @@
 @{
 	/*
-	* Copyright 2017-2018, Optimizely
+	* Copyright 2017-2018, 2023 Optimizely
 	*
 	* Licensed under the Apache License, Version 2.0 (the "License");
 	* you may not use this file except in compliance with the License.
 	* You may obtain a copy of the License at
 	*
-	* http://www.apache.org/licenses/LICENSE-2.0
+	* https://www.apache.org/licenses/LICENSE-2.0
 	*
 	* Unless required by applicable law or agreed to in writing, software
 	* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,7 @@
 }
 
 <!DOCTYPE html>
-<html>
+<html lang="">
 <head>
 	<meta charset="utf-8" />
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -37,7 +37,7 @@
 					@Html.ActionLink("Home", "Index", "Home", new { area = "" }, new { @class = "nav-link" })
 				</li>
 				<li class="nav-item">
-					@Html.ActionLink("Demo", "Index", "Demo/Config", new { area = "" }, new { @class = "nav-link" })
+					@Html.ActionLink("Demo", "Config", "Demo", new { area = "" }, new { @class = "nav-link" })
 				</li>
 			</ul>
 		</div>

diff --git a/OptimizelySDK.DemoApp/packages.config b/OptimizelySDK.DemoApp/packages.config
@@ -15,7 +15,7 @@
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
   <package id="Modernizr" version="2.6.2" targetFramework="net45" />
   <package id="murmurhash-signed" version="1.0.2" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="13.0.2" targetFramework="net45" />
   <package id="NJsonSchema" version="10.8.0" targetFramework="net45" />
   <package id="Optimizely.SDK" version="3.2.0" targetFramework="net45" />
   <package id="popper.js" version="1.12.9" targetFramework="net45" />

diff --git a/OptimizelySDK.Net35/Properties/AssemblyInfo.cs b/OptimizelySDK.Net35/Properties/AssemblyInfo.cs
@@ -38,5 +38,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("4.0.0.0")]
-[assembly: AssemblyFileVersion("4.0.0.0-beta")]
+[assembly: AssemblyFileVersion("4.0.0.0")]
 [assembly: AssemblyInformationalVersion("4.0.0-beta")] // Used by Nuget.
diff --git a/OptimizelySDK.Net40/Properties/AssemblyInfo.cs b/OptimizelySDK.Net40/Properties/AssemblyInfo.cs
@@ -38,5 +38,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("4.0.0.0")]
-[assembly: AssemblyFileVersion("4.0.0.0-beta")]
+[assembly: AssemblyFileVersion("4.0.0.0")]
 [assembly: AssemblyInformationalVersion("4.0.0-beta")] // Used by Nuget.
diff --git a/OptimizelySDK.NetStandard16/Properties/AssemblyInfo.cs b/OptimizelySDK.NetStandard16/Properties/AssemblyInfo.cs
@@ -38,5 +38,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("4.0.0")]
-[assembly: AssemblyFileVersion("4.0.0.0-beta")]
+[assembly: AssemblyFileVersion("4.0.0.0")]
 [assembly: AssemblyInformationalVersion("4.0.0-beta")] // Used by Nuget.
diff --git a/OptimizelySDK.NetStandard20/Properties/AssemblyInfo.cs b/OptimizelySDK.NetStandard20/Properties/AssemblyInfo.cs
@@ -38,5 +38,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("4.0.0.0")]
-[assembly: AssemblyFileVersion("4.0.0.0-beta")]
+[assembly: AssemblyFileVersion("4.0.0.0")]
 [assembly: AssemblyInformationalVersion("4.0.0-beta")] // Used by Nuget.
diff --git a/OptimizelySDK.Tests/App.config b/OptimizelySDK.Tests/App.config
@@ -6,26 +6,15 @@
 <configuration>
 
     <configSections>
-        <section name="optlySDKConfigSection"
-                 type="OptimizelySDK.OptimizelySDKConfigSection, OptimizelySDK"/>
+        <section name="optlySDKConfigSection" type="OptimizelySDK.OptimizelySDKConfigSection, OptimizelySDK" />
     </configSections>
 
     <optlySDKConfigSection>
 
-        <HttpProjectConfig sdkKey="43214321"
-                           url="www.testurl.com"
-                           format="https://cdn.optimizely.com/data/{0}.json"
-                           pollingInterval="2000"
-                           blockingTimeOutPeriod="10000"
-                           datafileAccessToken="testingtoken123"
-                           autoUpdate="true"
-                           defaultStart="true">
+        <HttpProjectConfig sdkKey="43214321" url="www.testurl.com" format="https://cdn.optimizely.com/data/{0}.json" pollingInterval="2000" blockingTimeOutPeriod="10000" datafileAccessToken="testingtoken123" autoUpdate="true" defaultStart="true">
         </HttpProjectConfig>
 
-        <BatchEventProcessor batchSize="10"
-                             flushInterval="2000"
-                             timeoutInterval="10000"
-                             defaultStart="true">
+        <BatchEventProcessor batchSize="10" flushInterval="2000" timeoutInterval="10000" defaultStart="true">
         </BatchEventProcessor>
 
     </optlySDKConfigSection>
@@ -36,16 +25,16 @@
     <runtime>
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
             <dependentAssembly>
-                <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234"/>
+                <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/>
+                <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
             </dependentAssembly>
         </assemblyBinding>
     </runtime>
     <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
     </startup>
 </configuration>
diff --git a/OptimizelySDK.Tests/Properties/AssemblyInfo.cs b/OptimizelySDK.Tests/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("4.0.0.0")]
-[assembly: AssemblyFileVersion("4.0.0.0-beta")]
+[assembly: AssemblyFileVersion("4.0.0.0")]
 [assembly: AssemblyInformationalVersion("4.0.0-beta")] // Used by Nuget.
diff --git a/OptimizelySDK.Tests/packages.config b/OptimizelySDK.Tests/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Castle.Core" version="4.0.0" targetFramework="net45"/>
-  <package id="Moq" version="4.7.1" targetFramework="net45"/>
-  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45"/>
-  <package id="NUnit" version="2.6.4" targetFramework="net45"/>
-  <package id="NUnitTestAdapter" version="2.1.1" targetFramework="net45"/>
-  <package id="OpenCover" version="4.6.519" targetFramework="net45"/>
-  <package id="ReportGenerator" version="2.5.6" targetFramework="net45"/>
+  <package id="Castle.Core" version="4.0.0" targetFramework="net45" />
+  <package id="Moq" version="4.7.1" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="13.0.2" targetFramework="net45" />
+  <package id="NUnit" version="2.6.4" targetFramework="net45" />
+  <package id="NUnitTestAdapter" version="2.1.1" targetFramework="net45" />
+  <package id="OpenCover" version="4.6.519" targetFramework="net45" />
+  <package id="ReportGenerator" version="2.5.6" targetFramework="net45" />
 </packages>
diff --git a/OptimizelySDK.sln b/OptimizelySDK.sln
@@ -16,10 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		CHANGELOG.MD = CHANGELOG.MD
 		CONTRIBUTING.md = CONTRIBUTING.md
-		OptimizelySDK.Package\OptimizelySDK.nuspec = OptimizelySDK.Package\OptimizelySDK.nuspec
-		OptimizelySDK.Package\pack.ps1 = OptimizelySDK.Package\pack.ps1
 		README.md = README.md
-		OptimizelySDK.Package\verifysn.ps1 = OptimizelySDK.Package\verifysn.ps1
 		keypair.snk = keypair.snk
 	EndProjectSection
 EndProject

diff --git a/OptimizelySDK/Config/HttpProjectConfigManager.cs b/OptimizelySDK/Config/HttpProjectConfigManager.cs
@@ -19,6 +19,7 @@
 #endif
 
 using System;
+using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 using OptimizelySDK.ErrorHandler;
@@ -179,7 +180,7 @@ private string GetRemoteDatafileResponse()
             }
 
             var lastModified = result.Headers.GetValues("Last-Modified");
-            if (!string.IsNullOrEmpty(lastModified.First()))
+            if (!string.IsNullOrEmpty(lastModified?.First()))
             {
                 LastModifiedSince = lastModified.First();
             }
@@ -234,7 +235,6 @@ public class Builder
             private bool StartByDefault = true;
             private NotificationCenter NotificationCenter;
 
-
             private bool IsBlockingTimeoutProvided = false;
             private bool IsPollingIntervalProvided = false;
 

diff --git a/OptimizelySDK/OptimizelyDecisionContext.cs b/OptimizelySDK/OptimizelyDecisionContext.cs
@@ -27,7 +27,6 @@ public class OptimizelyDecisionContext
 
         private string flagKey;
         private string ruleKey;
-        private string decisionKey;
 
         /// <summary>
         /// Represents the object is valid or not.

diff --git a/OptimizelySDK/Properties/AssemblyInfo.cs b/OptimizelySDK/Properties/AssemblyInfo.cs
@@ -42,5 +42,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("4.0.0.0")]
-[assembly: AssemblyFileVersion("4.0.0.0-beta")]
+[assembly: AssemblyFileVersion("4.0.0.0")]
 [assembly: AssemblyInformationalVersion("4.0.0-beta")] // Used by Nuget.