Skip to content

Commit

Permalink
Pulled .NET version back to 3.5 for compatibility per PR feedback.
Browse files Browse the repository at this point in the history
* Updates Newtonsoft.Json lib to latest 3.5-compatible version.
* Removes unused, otherwise incompatible System.Xaml reference
  • Loading branch information
DavidRieman committed Jan 28, 2017
1 parent a599869 commit 564265c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
7 changes: 3 additions & 4 deletions BabySmash.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BabySmash</RootNamespace>
<AssemblyName>BabySmash</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
Expand Down Expand Up @@ -72,8 +72,8 @@
<Compile Include="Extensions\ObjectExtensions.cs" />
<Compile Include="Shapes\BabySmashShape.cs" />
<Compile Include="WordFinder.cs" />
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>packages\Newtonsoft.Json.9.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="PresentationFramework.Luna">
Expand All @@ -87,7 +87,6 @@
<Reference Include="System.Drawing" />
<Reference Include="System.Speech" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
Expand Down
2 changes: 1 addition & 1 deletion app.config
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,5 @@
</setting>
</BabySmash.Properties.Settings>
</userSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup>
<startup><supportedRuntime version="v2.0.50727"/></startup>
</configuration>
2 changes: 1 addition & 1 deletion packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="8.0.2" targetFramework="net461" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net35" />
</packages>

0 comments on commit 564265c

Please sign in to comment.