Skip to content

Commit

Permalink
Update to Roslyn V2
Browse files Browse the repository at this point in the history
Update to VS2017
  • Loading branch information
AndriySvyryd committed Mar 10, 2017
1 parent 5976b76 commit c14394e
Show file tree
Hide file tree
Showing 8 changed files with 101 additions and 137 deletions.
11 changes: 5 additions & 6 deletions CSharpScriptSerializer.sln
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.26228.4
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B8D8928D-0CDF-4ED4-B449-796AC2EC8A55}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{83B31A66-395B-4AF7-B0C1-2D037901D152}"
ProjectSection(SolutionItems) = preProject
global.json = global.json
README.md = README.md
EndProjectSection
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CSharpScriptSerializer", "src\CSharpScriptSerializer\CSharpScriptSerializer.xproj", "{B618F170-1A14-4205-A372-98D98B34914A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{27E730AF-EE56-4537-8296-CB205133018C}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CSharpScriptSerializer.Tests", "test\CSharpScriptSerializer.Tests\CSharpScriptSerializer.Tests.xproj", "{041750C6-8CC1-4FDF-8F27-40630239A9F3}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSharpScriptSerializer", "src\CSharpScriptSerializer\CSharpScriptSerializer.csproj", "{B618F170-1A14-4205-A372-98D98B34914A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSharpScriptSerializer.Tests", "test\CSharpScriptSerializer.Tests\CSharpScriptSerializer.Tests.csproj", "{041750C6-8CC1-4FDF-8F27-40630239A9F3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
6 changes: 0 additions & 6 deletions global.json

This file was deleted.

55 changes: 55 additions & 0 deletions src/CSharpScriptSerializer/CSharpScriptSerializer.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<AssemblyName>CSharpScriptSerializer</AssemblyName>
<PackageId>CSharpScriptSerializer</PackageId>
<AssemblyTitle>CSharpScriptSerializer</AssemblyTitle>
<Title>CSharpScriptSerializer</Title>
<VersionPrefix>1.2.0</VersionPrefix>
<TargetFrameworks>netstandard1.5;net46</TargetFrameworks>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.5' ">1.6.1</NetStandardImplicitPackageVersion>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
$(PackageTargetFallback);portable-net45+win8
</PackageTargetFallback>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<Description>Serialize to C# scripts</Description>
<Authors>Andriy Svyryd</Authors>
<PackageTags>Roslyn;CSharp;C#;CSX;Script;Serialization</PackageTags>
<PackageReleaseNotes>Version 1.2.0
* Update to Roslyn V2
Version 1.1.2
* Increase max length for string literals
Version 1.1.1
* Use verbatim literals for multi-line strings
* Remove redundant flags enum values
Version 1.1.0
* Enable customizing the property serialization condition in PropertyCSScriptSerializer
Version 1.0.0
* Enable customizing the default values in PropertyCSScriptSerializer
* Change ICSScriptSerializable.GetSerializer() to return ICSScriptSerializer
* Fix parameters not being used in DeserializeAsync

Version 1.0.0-alpha1
* Initial release</PackageReleaseNotes>
<PackageProjectUrl>https://github.com/AndriySvyryd/CSharpScriptSerializer</PackageProjectUrl>
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/AndriySvyryd/CSharpScriptSerializer.git</RepositoryUrl>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<IncludeSymbols>True</IncludeSymbols>
<IncludeSource>True</IncludeSource>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="2.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.0.0" />
</ItemGroup>

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

</Project>
19 changes: 0 additions & 19 deletions src/CSharpScriptSerializer/CSharpScriptSerializer.xproj

This file was deleted.

45 changes: 0 additions & 45 deletions src/CSharpScriptSerializer/project.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<AssemblyName>CSharpScriptSerializer.Tests</AssemblyName>
<PackageId>CSharpScriptSerializer.Tests</PackageId>
<VersionPrefix>1.2.0</VersionPrefix>
<TargetFrameworks>netcoreapp1.1;net46</TargetFrameworks>
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">1.1.1</RuntimeFrameworkVersion>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
$(PackageTargetFallback);portable-net45+win8
</PackageTargetFallback>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\CSharpScriptSerializer\CSharpScriptSerializer.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
<PackageReference Include="xunit" Version="2.2.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
<PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
</ItemGroup>

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

<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>

</Project>

This file was deleted.

39 changes: 0 additions & 39 deletions test/CSharpScriptSerializer.Tests/project.json

This file was deleted.

0 comments on commit c14394e

Please sign in to comment.