Skip to content

Commit

Permalink
Upgraded the solution to Visual Studio 2017
Browse files Browse the repository at this point in the history
Upgraded the solution to Visual Studio 2017 and all .net 4.5.2 projects switched to version 4.6.2.
  • Loading branch information
A-Sabet committed Jul 6, 2017
1 parent e35fa98 commit 2b8d9fe
Show file tree
Hide file tree
Showing 9 changed files with 55 additions and 64 deletions.
14 changes: 7 additions & 7 deletions SharpSimpleNLG.sln
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.26430.14
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpSimpleNLGTests", "SharpSimpleNLGTests\SharpSimpleNLGTests.csproj", "{D786FBFE-CFBC-4DDA-B408-60ADD0731B6C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpSimpleNLGConsole", "SharpSimpleNLGConsole\SharpSimpleNLGConsole.csproj", "{3F729462-5264-49B1-8043-EAA050A2B3ED}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documentation", "Documentation", "{B3B6ECC4-364C-462E-ACEB-EA8304C04F1F}"
ProjectSection(SolutionItems) = preProject
JavaToCsharpLearnings.md = JavaToCsharpLearnings.md
LICENSE.md = LICENSE.md
README.md = README.md
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpSimpleNLGTests", "SharpSimpleNLGTests\SharpSimpleNLGTests.csproj", "{D786FBFE-CFBC-4DDA-B408-60ADD0731B6C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpSimpleNLGConsole", "SharpSimpleNLGConsole\SharpSimpleNLGConsole.csproj", "{3F729462-5264-49B1-8043-EAA050A2B3ED}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpSimpleNLGDotNet45", "SharpSimpleNLGDotNet\SharpSimpleNLGDotNet45.csproj", "{FD418A41-A46E-4FD7-A6DB-FF3EBB4AFA29}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SharpSimpleNLG", "SharpSimpleNLG\SharpSimpleNLG.xproj", "{16F344A8-B688-4D95-8DA6-2E207D47AECB}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpSimpleNLG", "SharpSimpleNLG\SharpSimpleNLG.csproj", "{16F344A8-B688-4D95-8DA6-2E207D47AECB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
40 changes: 40 additions & 0 deletions SharpSimpleNLG/SharpSimpleNLG.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<VersionPrefix>1.1.0</VersionPrefix>
<TargetFrameworks>net45;netstandard1.3</TargetFrameworks>
<AssemblyName>SharpSimpleNLG</AssemblyName>
<PackageId>SharpSimpleNLG</PackageId>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
</PropertyGroup>

<ItemGroup>
<EmbeddedResource Include="lexicon\default-lexicon.xml" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System.Runtime" />
<Reference Include="System.Xml" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<PackageReference Include="System.Collections" Version="4.0.11-*" />
<PackageReference Include="System.Console" Version="4.0.0-*" />
<PackageReference Include="System.Diagnostics.Debug" Version="4.0.11-*" />
<PackageReference Include="System.IO.FileSystem" Version="4.0.1-*" />
<PackageReference Include="System.Linq" Version="4.1.0-*" />
<PackageReference Include="System.Reflection.Extensions" Version="4.0.1-*" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.1.0-*" />
<PackageReference Include="System.Xml.XmlDocument" Version="4.0.1-*" />
</ItemGroup>

</Project>
21 changes: 0 additions & 21 deletions SharpSimpleNLG/SharpSimpleNLG.xproj

This file was deleted.

30 changes: 0 additions & 30 deletions SharpSimpleNLG/project.json

This file was deleted.

6 changes: 3 additions & 3 deletions SharpSimpleNLGConsole/App.config
Original file line number Diff line number Diff line change
@@ -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.2" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
</startup>
</configuration>
</configuration>
3 changes: 2 additions & 1 deletion SharpSimpleNLGConsole/SharpSimpleNLGConsole.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SharpSimpleNLGConsole</RootNamespace>
<AssemblyName>SharpSimpleNLGConsole</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand Down
2 changes: 1 addition & 1 deletion SharpSimpleNLGDotNet/SharpSimpleNLGDotNet45.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SharpSimpleNLG</RootNamespace>
<AssemblyName>SharpSimpleNLG</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down
3 changes: 2 additions & 1 deletion SharpSimpleNLGTests/SharpSimpleNLGTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SharpSimpleNLGTests</RootNamespace>
<AssemblyName>SharpSimpleNLGTests</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
<IsCodedUITest>False</IsCodedUITest>
<TestProjectType>UnitTest</TestProjectType>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down
Binary file added UpgradeLog.htm
Binary file not shown.

0 comments on commit 2b8d9fe

Please sign in to comment.