Skip to content

Commit bfe4e64

Browse files
mikechu-optimizelymikechu-optimizely
authored
[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
1 parent f3a21d5 commit bfe4e64

File tree

14 files changed

+29
-48
lines changed

14 files changed

+29
-48
lines changed

‎OptimizelySDK.DemoApp/OptimizelySDK.DemoApp.csproj

+1-5
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@
6565
<Private>True</Private>
6666
</Reference>
6767
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
68-
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
69-
<Private>True</Private>
68+
<HintPath>..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
7069
</Reference>
7170
<Reference Include="System" />
7271
<Reference Include="System.Data" />
@@ -249,9 +248,6 @@
249248
<Content Include="Scripts\popper-utils.min.js.map" />
250249
<Content Include="Scripts\popper-utils.js.map" />
251250
</ItemGroup>
252-
<ItemGroup>
253-
<Folder Include="App_Data\" />
254-
</ItemGroup>
255251
<ItemGroup>
256252
<Content Include="packages.config" />
257253
</ItemGroup>

‎OptimizelySDK.DemoApp/Views/Shared/_Layout.cshtml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
@{
22
/*
3-
* Copyright 2017-2018, Optimizely
3+
* Copyright 2017-2018, 2023 Optimizely
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.
77
* You may obtain a copy of the License at
88
*
9-
* http://www.apache.org/licenses/LICENSE-2.0
9+
* https://www.apache.org/licenses/LICENSE-2.0
1010
*
1111
* Unless required by applicable law or agreed to in writing, software
1212
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,7 +17,7 @@
1717
}
1818

1919
<!DOCTYPE html>
20-
<html>
20+
<html lang="">
2121
<head>
2222
<meta charset="utf-8" />
2323
<meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -37,7 +37,7 @@
3737
@Html.ActionLink("Home", "Index", "Home", new { area = "" }, new { @class = "nav-link" })
3838
</li>
3939
<li class="nav-item">
40-
@Html.ActionLink("Demo", "Index", "Demo/Config", new { area = "" }, new { @class = "nav-link" })
40+
@Html.ActionLink("Demo", "Config", "Demo", new { area = "" }, new { @class = "nav-link" })
4141
</li>
4242
</ul>
4343
</div>

‎OptimizelySDK.DemoApp/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
1616
<package id="Modernizr" version="2.6.2" targetFramework="net45" />
1717
<package id="murmurhash-signed" version="1.0.2" targetFramework="net45" />
18-
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
18+
<package id="Newtonsoft.Json" version="13.0.2" targetFramework="net45" />
1919
<package id="NJsonSchema" version="10.8.0" targetFramework="net45" />
2020
<package id="Optimizely.SDK" version="3.2.0" targetFramework="net45" />
2121
<package id="popper.js" version="1.12.9" targetFramework="net45" />

‎OptimizelySDK.Net35/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@
3838
// You can specify all the values or you can default the Build and Revision Numbers
3939
// by using the '*' as shown below:
4040
[assembly: AssemblyVersion("4.0.0.0")]
41-
[assembly: AssemblyFileVersion("4.0.0.0-beta")]
41+
[assembly: AssemblyFileVersion("4.0.0.0")]
4242
[assembly: AssemblyInformationalVersion("4.0.0-beta")] // Used by Nuget.

‎OptimizelySDK.Net40/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@
3838
// You can specify all the values or you can default the Build and Revision Numbers
3939
// by using the '*' as shown below:
4040
[assembly: AssemblyVersion("4.0.0.0")]
41-
[assembly: AssemblyFileVersion("4.0.0.0-beta")]
41+
[assembly: AssemblyFileVersion("4.0.0.0")]
4242
[assembly: AssemblyInformationalVersion("4.0.0-beta")] // Used by Nuget.

‎OptimizelySDK.NetStandard16/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@
3838
// You can specify all the values or you can default the Build and Revision Numbers
3939
// by using the '*' as shown below:
4040
[assembly: AssemblyVersion("4.0.0")]
41-
[assembly: AssemblyFileVersion("4.0.0.0-beta")]
41+
[assembly: AssemblyFileVersion("4.0.0.0")]
4242
[assembly: AssemblyInformationalVersion("4.0.0-beta")] // Used by Nuget.

‎OptimizelySDK.NetStandard20/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@
3838
// You can specify all the values or you can default the Build and Revision Numbers
3939
// by using the '*' as shown below:
4040
[assembly: AssemblyVersion("4.0.0.0")]
41-
[assembly: AssemblyFileVersion("4.0.0.0-beta")]
41+
[assembly: AssemblyFileVersion("4.0.0.0")]
4242
[assembly: AssemblyInformationalVersion("4.0.0-beta")] // Used by Nuget.

‎OptimizelySDK.Tests/App.config

+8-19
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,15 @@
66
<configuration>
77

88
<configSections>
9-
<section name="optlySDKConfigSection"
10-
type="OptimizelySDK.OptimizelySDKConfigSection, OptimizelySDK"/>
9+
<section name="optlySDKConfigSection" type="OptimizelySDK.OptimizelySDKConfigSection, OptimizelySDK" />
1110
</configSections>
1211

1312
<optlySDKConfigSection>
1413

15-
<HttpProjectConfig sdkKey="43214321"
16-
url="www.testurl.com"
17-
format="https://cdn.optimizely.com/data/{0}.json"
18-
pollingInterval="2000"
19-
blockingTimeOutPeriod="10000"
20-
datafileAccessToken="testingtoken123"
21-
autoUpdate="true"
22-
defaultStart="true">
14+
<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">
2315
</HttpProjectConfig>
2416

25-
<BatchEventProcessor batchSize="10"
26-
flushInterval="2000"
27-
timeoutInterval="10000"
28-
defaultStart="true">
17+
<BatchEventProcessor batchSize="10" flushInterval="2000" timeoutInterval="10000" defaultStart="true">
2918
</BatchEventProcessor>
3019

3120
</optlySDKConfigSection>
@@ -36,16 +25,16 @@
3625
<runtime>
3726
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
3827
<dependentAssembly>
39-
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
40-
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234"/>
28+
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
29+
<bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
4130
</dependentAssembly>
4231
<dependentAssembly>
43-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
44-
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/>
32+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
33+
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
4534
</dependentAssembly>
4635
</assemblyBinding>
4736
</runtime>
4837
<startup>
49-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
38+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
5039
</startup>
5140
</configuration>

‎OptimizelySDK.Tests/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Revision and Build Numbers
3232
// by using the '*' as shown below:
3333
[assembly: AssemblyVersion("4.0.0.0")]
34-
[assembly: AssemblyFileVersion("4.0.0.0-beta")]
34+
[assembly: AssemblyFileVersion("4.0.0.0")]
3535
[assembly: AssemblyInformationalVersion("4.0.0-beta")] // Used by Nuget.

‎OptimizelySDK.Tests/packages.config

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Castle.Core" version="4.0.0" targetFramework="net45"/>
4-
<package id="Moq" version="4.7.1" targetFramework="net45"/>
5-
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45"/>
6-
<package id="NUnit" version="2.6.4" targetFramework="net45"/>
7-
<package id="NUnitTestAdapter" version="2.1.1" targetFramework="net45"/>
8-
<package id="OpenCover" version="4.6.519" targetFramework="net45"/>
9-
<package id="ReportGenerator" version="2.5.6" targetFramework="net45"/>
3+
<package id="Castle.Core" version="4.0.0" targetFramework="net45" />
4+
<package id="Moq" version="4.7.1" targetFramework="net45" />
5+
<package id="Newtonsoft.Json" version="13.0.2" targetFramework="net45" />
6+
<package id="NUnit" version="2.6.4" targetFramework="net45" />
7+
<package id="NUnitTestAdapter" version="2.1.1" targetFramework="net45" />
8+
<package id="OpenCover" version="4.6.519" targetFramework="net45" />
9+
<package id="ReportGenerator" version="2.5.6" targetFramework="net45" />
1010
</packages>

‎OptimizelySDK.sln

-3
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1616
ProjectSection(SolutionItems) = preProject
1717
CHANGELOG.MD = CHANGELOG.MD
1818
CONTRIBUTING.md = CONTRIBUTING.md
19-
OptimizelySDK.Package\OptimizelySDK.nuspec = OptimizelySDK.Package\OptimizelySDK.nuspec
20-
OptimizelySDK.Package\pack.ps1 = OptimizelySDK.Package\pack.ps1
2119
README.md = README.md
22-
OptimizelySDK.Package\verifysn.ps1 = OptimizelySDK.Package\verifysn.ps1
2320
keypair.snk = keypair.snk
2421
EndProjectSection
2522
EndProject

‎OptimizelySDK/Config/HttpProjectConfigManager.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#endif
2020

2121
using System;
22+
using System.Linq;
2223
using System.Net;
2324
using System.Threading.Tasks;
2425
using OptimizelySDK.ErrorHandler;
@@ -179,7 +180,7 @@ private string GetRemoteDatafileResponse()
179180
}
180181

181182
var lastModified = result.Headers.GetValues("Last-Modified");
182-
if (!string.IsNullOrEmpty(lastModified.First()))
183+
if (!string.IsNullOrEmpty(lastModified?.First()))
183184
{
184185
LastModifiedSince = lastModified.First();
185186
}
@@ -234,7 +235,6 @@ public class Builder
234235
private bool StartByDefault = true;
235236
private NotificationCenter NotificationCenter;
236237

237-
238238
private bool IsBlockingTimeoutProvided = false;
239239
private bool IsPollingIntervalProvided = false;
240240

‎OptimizelySDK/OptimizelyDecisionContext.cs

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ public class OptimizelyDecisionContext
2727

2828
private string flagKey;
2929
private string ruleKey;
30-
private string decisionKey;
3130

3231
/// <summary>
3332
/// Represents the object is valid or not.

‎OptimizelySDK/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@
4242
// You can specify all the values or you can default the Build and Revision Numbers
4343
// by using the '*' as shown below:
4444
[assembly: AssemblyVersion("4.0.0.0")]
45-
[assembly: AssemblyFileVersion("4.0.0.0-beta")]
45+
[assembly: AssemblyFileVersion("4.0.0.0")]
4646
[assembly: AssemblyInformationalVersion("4.0.0-beta")] // Used by Nuget.

0 commit comments

Comments
 (0)