Skip to content

Commit 8926b0c

Browse files
committed
Update to Roslyn V3.4.0
Target netstandard2.1
1 parent 7556439 commit 8926b0c

File tree

3 files changed

+17
-30
lines changed

3 files changed

+17
-30
lines changed

CSharpScriptSerializer.sln.DotSettings

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
8686
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
8787
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
88+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
8889
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
8990
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
9091
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>

src/CSharpScriptSerializer/CSharpScriptSerializer.csproj

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,19 @@
55
<PackageId>CSharpScriptSerializer</PackageId>
66
<AssemblyTitle>CSharpScriptSerializer</AssemblyTitle>
77
<Title>CSharpScriptSerializer</Title>
8-
<VersionPrefix>1.6.1</VersionPrefix>
9-
<TargetFrameworks>netstandard1.5;net46</TargetFrameworks>
10-
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.5' ">1.6.1</NetStandardImplicitPackageVersion>
8+
<VersionPrefix>2.0.0</VersionPrefix>
9+
<TargetFrameworks>netstandard2.1</TargetFrameworks>
10+
<NetStandardImplicitPackageVersion>2.0.3</NetStandardImplicitPackageVersion>
1111
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
1212
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
13-
<Description>Serialize to C# scripts</Description>
13+
<Description>Serialize objects to C# scripts</Description>
1414
<Authors>Andriy Svyryd</Authors>
1515
<PackageTags>Roslyn;CSharp;C#;CSX;Script;Serialization</PackageTags>
1616
<PackageReleaseNotes>
1717
<![CDATA[
18+
Version 2.0.0
19+
* Update to Roslyn V3.4.0
20+
* Target netstandard2.1
1821
Version 1.6.1
1922
* Update to Roslyn V2.9.0
2023
Version 1.5.0
@@ -26,12 +29,10 @@ Version 1.3.0
2629
* Update to Roslyn V2.3.1
2730
Version 1.2.0
2831
* Update to Roslyn V2
29-
Version 1.1.2
30-
* Increase max length for string literals
3132
]]>
3233
</PackageReleaseNotes>
3334
<PackageProjectUrl>https://github.com/AndriySvyryd/CSharpScriptSerializer</PackageProjectUrl>
34-
<PackageLicense>http://www.apache.org/licenses/LICENSE-2.0</PackageLicense>
35+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
3536
<RepositoryType>git</RepositoryType>
3637
<RepositoryUrl>https://github.com/AndriySvyryd/CSharpScriptSerializer.git</RepositoryUrl>
3738
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
@@ -41,14 +42,8 @@ Version 1.1.2
4142
</PropertyGroup>
4243

4344
<ItemGroup>
44-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="2.9.0" />
45-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.9.0" />
46-
</ItemGroup>
47-
48-
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
49-
<Reference Include="System.Runtime" />
50-
<Reference Include="System" />
51-
<Reference Include="Microsoft.CSharp" />
45+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.4.0" />
46+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.4.0" />
5247
</ItemGroup>
5348

5449
</Project>

test/CSharpScriptSerializer.Tests/CSharpScriptSerializer.Tests.csproj

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<PropertyGroup>
44
<AssemblyName>CSharpScriptSerializer.Tests</AssemblyName>
55
<PackageId>CSharpScriptSerializer.Tests</PackageId>
6-
<VersionPrefix>1.6.1</VersionPrefix>
7-
<TargetFrameworks>netcoreapp2.1;net46</TargetFrameworks>
6+
<VersionPrefix>2.0.0</VersionPrefix>
7+
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
99
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
1010
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
@@ -15,19 +15,10 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
19-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
20-
<PackageReference Include="xunit" Version="2.3.1" />
21-
</ItemGroup>
22-
23-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
24-
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
25-
</ItemGroup>
26-
27-
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
28-
<Reference Include="Microsoft.CSharp" />
29-
<Reference Include="System.Runtime" />
30-
<Reference Include="System" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
19+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
20+
<PackageReference Include="xunit" Version="2.4.1" />
21+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
3122
</ItemGroup>
3223

3324
<ItemGroup>

0 commit comments

Comments
 (0)