Upgrading .NET Framework from .NET45 to .NET452 (#2135)

* Upgrading .NET Framework from .NET45 to .NET452 * updating release history * fixing release history
microsoft · Oct 28, 2020 · bf54b26 · bf54b26
1 parent 018374f
commit bf54b26
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 9 deletions.
diff --git a/src/ReleaseHistory.md b/src/ReleaseHistory.md
@@ -1,5 +1,8 @@
 # SARIF Package Release History (SDK, Driver, Converters, and Multitool)
 
+* FEATURE: PACKAGE BREAKING: Upgrade from .NET Framework 4.5 to .NET Framework 4.5.2 [#2135](https://github.com/microsoft/sarif-sdk/pull/2135)
+
+## **v2.3.7** [Sdk](https://www.nuget.org/packages/Sarif.Sdk/2.3.7) | [Driver](https://www.nuget.org/packages/Sarif.Driver/2.3.7) | [Converters](https://www.nuget.org/packages/Sarif.Converters/2.3.7) | [Multitool](https://www.nuget.org/packages/Sarif.Multitool/2.3.7) | [Multitool Library](https://www.nuget.org/packages/Sarif.Multitool.Library/2.3.7)
 * DEPENDENCY BREAKING: SARIF now requires Newtonsoft.JSON 11.0.2 (rather than 10.0.3)
 * DEPENDENCY: SARIF TypeScript package now requires minimist 1.2.3 or later (rather than >=1.2.0)
 * BUGFIX: Fix index out of range exception when baselining [#2102](https://github.com/microsoft/sarif-sdk/pull/2102)

diff --git a/src/Samples/Sarif.Sdk.Sample.sln b/src/Samples/Sarif.Sdk.Sample.sln
@@ -1,14 +1,18 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27428.2037
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30621.155
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sarif.Sdk.Sample", "Sarif.Sdk.Sample\Sarif.Sdk.Sample.csproj", "{38369193-CC76-4CA6-AF49-DD6F5BD05DEA}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SarifDeferredSample", "SarifDeferredSample\SarifDeferredSample.csproj", "{EBE491D1-790D-43CA-899B-FCD2FDD21823}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sarif", "..\Sarif\Sarif.csproj", "{D669E761-7E74-48B8-85A6-4B571312D2C7}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SarifTrim", "SarifTrim\SarifTrim.csproj", "{41D504E0-7EAD-4C7A-9A4B-BF2C36C48AA4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SarifToCsv", "SarifToCsv\SarifToCsv.csproj", "{D308471E-C9BE-4A41-B3A8-1BB04B22F6E7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -27,6 +31,14 @@ Global
 		{D669E761-7E74-48B8-85A6-4B571312D2C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D669E761-7E74-48B8-85A6-4B571312D2C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D669E761-7E74-48B8-85A6-4B571312D2C7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{41D504E0-7EAD-4C7A-9A4B-BF2C36C48AA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{41D504E0-7EAD-4C7A-9A4B-BF2C36C48AA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{41D504E0-7EAD-4C7A-9A4B-BF2C36C48AA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{41D504E0-7EAD-4C7A-9A4B-BF2C36C48AA4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D308471E-C9BE-4A41-B3A8-1BB04B22F6E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D308471E-C9BE-4A41-B3A8-1BB04B22F6E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D308471E-C9BE-4A41-B3A8-1BB04B22F6E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D308471E-C9BE-4A41-B3A8-1BB04B22F6E7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/Samples/SarifTrim/App.config b/src/Samples/SarifTrim/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
     </startup>
-</configuration>
+</configuration>
diff --git a/src/Samples/SarifTrim/SarifTrim.csproj b/src/Samples/SarifTrim/SarifTrim.csproj
@@ -8,9 +8,10 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>SarifTrim</RootNamespace>
     <AssemblyName>SarifTrim</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

diff --git a/src/Sarif/Sarif.csproj b/src/Sarif/Sarif.csproj
@@ -20,7 +20,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;</TargetFrameworks>
-    <TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net461;net45</TargetFrameworks>
+    <TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net461;net452</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -35,8 +35,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Condition="'$(TargetFramework)' == 'net45' Or '$(TargetFramework)' == 'net461' " Include="System.Web" />
-    <Reference Condition="'$(TargetFramework)' == 'net45' " Include="System.Runtime" />
+    <Reference Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net461' " Include="System.Web" />
+    <Reference Condition="'$(TargetFramework)' == 'net452' " Include="System.Runtime" />
   </ItemGroup>
 
   <ItemGroup Label="Packaging">