Skip to content

Commit c14394e

Browse files
AndriySvyrydAndriySvyryd
committed
Update to Roslyn V2
Update to VS2017
1 parent 5976b76 commit c14394e

File tree

8 files changed

+101
-137
lines changed

8 files changed

+101
-137
lines changed

‎CSharpScriptSerializer.sln‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26228.4
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B8D8928D-0CDF-4ED4-B449-796AC2EC8A55}"
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{83B31A66-395B-4AF7-B0C1-2D037901D152}"
99
ProjectSection(SolutionItems) = preProject
10-
global.json = global.json
1110
README.md = README.md
1211
EndProjectSection
1312
EndProject
14-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CSharpScriptSerializer", "src\CSharpScriptSerializer\CSharpScriptSerializer.xproj", "{B618F170-1A14-4205-A372-98D98B34914A}"
15-
EndProject
1613
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{27E730AF-EE56-4537-8296-CB205133018C}"
1714
EndProject
18-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CSharpScriptSerializer.Tests", "test\CSharpScriptSerializer.Tests\CSharpScriptSerializer.Tests.xproj", "{041750C6-8CC1-4FDF-8F27-40630239A9F3}"
15+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSharpScriptSerializer", "src\CSharpScriptSerializer\CSharpScriptSerializer.csproj", "{B618F170-1A14-4205-A372-98D98B34914A}"
16+
EndProject
17+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSharpScriptSerializer.Tests", "test\CSharpScriptSerializer.Tests\CSharpScriptSerializer.Tests.csproj", "{041750C6-8CC1-4FDF-8F27-40630239A9F3}"
1918
EndProject
2019
Global
2120
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎global.json‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/CSharpScriptSerializer/CSharpScriptSerializer.csproj‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<AssemblyName>CSharpScriptSerializer</AssemblyName>
5+
<PackageId>CSharpScriptSerializer</PackageId>
6+
<AssemblyTitle>CSharpScriptSerializer</AssemblyTitle>
7+
<Title>CSharpScriptSerializer</Title>
8+
<VersionPrefix>1.2.0</VersionPrefix>
9+
<TargetFrameworks>netstandard1.5;net46</TargetFrameworks>
10+
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.5' ">1.6.1</NetStandardImplicitPackageVersion>
11+
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
12+
$(PackageTargetFallback);portable-net45+win8
13+
</PackageTargetFallback>
14+
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
15+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
16+
<Description>Serialize to C# scripts</Description>
17+
<Authors>Andriy Svyryd</Authors>
18+
<PackageTags>Roslyn;CSharp;C#;CSX;Script;Serialization</PackageTags>
19+
<PackageReleaseNotes>Version 1.2.0
20+
* Update to Roslyn V2
21+
Version 1.1.2
22+
* Increase max length for string literals
23+
Version 1.1.1
24+
* Use verbatim literals for multi-line strings
25+
* Remove redundant flags enum values
26+
Version 1.1.0
27+
* Enable customizing the property serialization condition in PropertyCSScriptSerializer
28+
Version 1.0.0
29+
* Enable customizing the default values in PropertyCSScriptSerializer
30+
* Change ICSScriptSerializable.GetSerializer() to return ICSScriptSerializer
31+
* Fix parameters not being used in DeserializeAsync
32+
33+
Version 1.0.0-alpha1
34+
* Initial release</PackageReleaseNotes>
35+
<PackageProjectUrl>https://github.com/AndriySvyryd/CSharpScriptSerializer</PackageProjectUrl>
36+
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
37+
<RepositoryType>git</RepositoryType>
38+
<RepositoryUrl>https://github.com/AndriySvyryd/CSharpScriptSerializer.git</RepositoryUrl>
39+
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
40+
<IncludeSymbols>True</IncludeSymbols>
41+
<IncludeSource>True</IncludeSource>
42+
</PropertyGroup>
43+
44+
<ItemGroup>
45+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="2.0.0" />
46+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.0.0" />
47+
</ItemGroup>
48+
49+
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
50+
<Reference Include="System.Runtime" />
51+
<Reference Include="System" />
52+
<Reference Include="Microsoft.CSharp" />
53+
</ItemGroup>
54+
55+
</Project>

‎src/CSharpScriptSerializer/CSharpScriptSerializer.xproj‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎src/CSharpScriptSerializer/project.json‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎test/CSharpScriptSerializer.Tests/CSharpScriptSerializer.Tests.csproj‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<AssemblyName>CSharpScriptSerializer.Tests</AssemblyName>
5+
<PackageId>CSharpScriptSerializer.Tests</PackageId>
6+
<VersionPrefix>1.2.0</VersionPrefix>
7+
<TargetFrameworks>netcoreapp1.1;net46</TargetFrameworks>
8+
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">1.1.1</RuntimeFrameworkVersion>
9+
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
10+
$(PackageTargetFallback);portable-net45+win8
11+
</PackageTargetFallback>
12+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
13+
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
14+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
15+
</PropertyGroup>
16+
17+
<ItemGroup>
18+
<ProjectReference Include="..\..\src\CSharpScriptSerializer\CSharpScriptSerializer.csproj" />
19+
</ItemGroup>
20+
21+
<ItemGroup>
22+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
23+
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
24+
<PackageReference Include="xunit" Version="2.2.0" />
25+
</ItemGroup>
26+
27+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
28+
<PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
29+
</ItemGroup>
30+
31+
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
32+
<Reference Include="Microsoft.CSharp" />
33+
<Reference Include="System.Runtime" />
34+
<Reference Include="System" />
35+
</ItemGroup>
36+
37+
<ItemGroup>
38+
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
39+
</ItemGroup>
40+
41+
</Project>

‎test/CSharpScriptSerializer.Tests/CSharpScriptSerializer.Tests.xproj‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎test/CSharpScriptSerializer.Tests/project.json‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)