Skip to content

Commit 6a04af7

Browse files
committed
Move SimpleJson back to the core lib
1 parent bb32946 commit 6a04af7

File tree

4 files changed

+2
-39
lines changed

4 files changed

+2
-39
lines changed

RestSharp.sln

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestSharp.Serializers.Utf8J
2323
EndProject
2424
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestSharp.Serializers.SystemTextJson", "src\RestSharp.Serializers.SystemTextJson\RestSharp.Serializers.SystemTextJson.csproj", "{6914F0EF-F6D2-4BE6-8477-553EBBFF3BEE}"
2525
EndProject
26-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RestSharp.Serializers.SimpleJson", "src\RestSharp.Serializers.SimpleJson\RestSharp.Serializers.SimpleJson.csproj", "{859EEED2-83A4-44D1-98D9-CE3179BF7546}"
27-
EndProject
2826
Global
2927
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3028
Debug.Appveyor|Any CPU = Debug.Appveyor|Any CPU
@@ -284,36 +282,6 @@ Global
284282
{6914F0EF-F6D2-4BE6-8477-553EBBFF3BEE}.Release|x64.Build.0 = Release|Any CPU
285283
{6914F0EF-F6D2-4BE6-8477-553EBBFF3BEE}.Release|x86.ActiveCfg = Release|Any CPU
286284
{6914F0EF-F6D2-4BE6-8477-553EBBFF3BEE}.Release|x86.Build.0 = Release|Any CPU
287-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Debug.Appveyor|Any CPU.ActiveCfg = Debug|Any CPU
288-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Debug.Appveyor|Any CPU.Build.0 = Debug|Any CPU
289-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Debug.Appveyor|ARM.ActiveCfg = Debug|Any CPU
290-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Debug.Appveyor|ARM.Build.0 = Debug|Any CPU
291-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Debug.Appveyor|Mixed Platforms.ActiveCfg = Debug|Any CPU
292-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Debug.Appveyor|Mixed Platforms.Build.0 = Debug|Any CPU
293-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Debug.Appveyor|x64.ActiveCfg = Debug|Any CPU
294-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Debug.Appveyor|x64.Build.0 = Debug|Any CPU
295-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Debug.Appveyor|x86.ActiveCfg = Debug|Any CPU
296-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Debug.Appveyor|x86.Build.0 = Debug|Any CPU
297-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
298-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Debug|Any CPU.Build.0 = Debug|Any CPU
299-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Debug|ARM.ActiveCfg = Debug|Any CPU
300-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Debug|ARM.Build.0 = Debug|Any CPU
301-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
302-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
303-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Debug|x64.ActiveCfg = Debug|Any CPU
304-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Debug|x64.Build.0 = Debug|Any CPU
305-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Debug|x86.ActiveCfg = Debug|Any CPU
306-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Debug|x86.Build.0 = Debug|Any CPU
307-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Release|Any CPU.ActiveCfg = Release|Any CPU
308-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Release|Any CPU.Build.0 = Release|Any CPU
309-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Release|ARM.ActiveCfg = Release|Any CPU
310-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Release|ARM.Build.0 = Release|Any CPU
311-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
312-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Release|Mixed Platforms.Build.0 = Release|Any CPU
313-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Release|x64.ActiveCfg = Release|Any CPU
314-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Release|x64.Build.0 = Release|Any CPU
315-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Release|x86.ActiveCfg = Release|Any CPU
316-
{859EEED2-83A4-44D1-98D9-CE3179BF7546}.Release|x86.Build.0 = Release|Any CPU
317285
EndGlobalSection
318286
GlobalSection(SolutionProperties) = preSolution
319287
HideSolutionNode = FALSE
@@ -329,6 +297,5 @@ Global
329297
{8BF81225-2F85-4412-AD18-6579CBA1879B} = {9051DDA0-E563-45D5-9504-085EBAACF469}
330298
{D5DCF088-1126-4E6A-A175-CF8B6D5089A3} = {8C7B43EB-2F93-483C-B433-E28F9386AD67}
331299
{6914F0EF-F6D2-4BE6-8477-553EBBFF3BEE} = {8C7B43EB-2F93-483C-B433-E28F9386AD67}
332-
{859EEED2-83A4-44D1-98D9-CE3179BF7546} = {8C7B43EB-2F93-483C-B433-E28F9386AD67}
333300
EndGlobalSection
334301
EndGlobal

src/Directory.Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<Description>Simple REST and HTTP API Client</Description>
1010
<Authors>John Sheehan, Andrew Young, Alexey Zimarev and RestSharp community</Authors>
1111
<Version>106.8.10</Version>
12-
<Optimize>true</Optimize>
1312
<AssemblyOriginatorKeyFile>..\..\RestSharp.snk</AssemblyOriginatorKeyFile>
1413
<SignAssembly>true</SignAssembly>
1514
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>

src/RestSharp/RestSharp.csproj

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,12 @@
77
<DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
88
</PropertyGroup>
99
<ItemGroup>
10-
<Reference Include="System.Web" Condition="'$(TargetFramework)' == 'net452'"/>
11-
</ItemGroup>
12-
<ItemGroup>
13-
<ProjectReference Include="..\RestSharp.Serializers.SimpleJson\RestSharp.Serializers.SimpleJson.csproj"/>
10+
<Reference Include="System.Web" Condition="'$(TargetFramework)' == 'net452'" />
1411
</ItemGroup>
1512

1613
<Target DependsOnTargets="ResolveReferences" Name="CopyProjectReferencesToPackage">
1714
<ItemGroup>
18-
<BuildOutputInPackage Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference'))"/>
15+
<BuildOutputInPackage Include="@(ReferenceCopyLocalPaths-&gt;WithMetadataValue('ReferenceSourceTarget', 'ProjectReference'))" />
1916
</ItemGroup>
2017
</Target>
2118
</Project>
File renamed without changes.

0 commit comments

Comments
 (0)