Skip to content

Commit 92ad955

Browse files
committed
Cleanup regions and trying to fix package push
1 parent 60ccb88 commit 92ad955

File tree

103 files changed

+1190
-990
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+1190
-990
lines changed

.github/workflows/build-master.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,9 @@ jobs:
5050
steps:
5151
- uses: actions/checkout@v1
5252

53-
- name: Create NuGet package
54-
run: dotnet pack -c Release -o nuget -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg
55-
56-
- name: Push NuGet package
57-
run: dotnet nuget push **/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
53+
- name: Create and push NuGet package
54+
run: |
55+
dotnet pack -c Release -o nuget -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg
56+
dotnet nuget push **/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
5857
5958

.github/workflows/publish-docs.yml

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

.github/workflows/pull-request.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@ name: Build and test PRs
33
on: [pull_request]
44

55
jobs:
6-
build:
6+
test:
77
runs-on: windows-latest
88

99
steps:
1010
- uses: actions/checkout@v1
11+
- uses: actions/setup-dotnet@v1
12+
with:
13+
dotnet-version: '3.1.100'
1114

1215
- name: Run tests netcoreapp3.1
1316
run: dotnet test -c Release -f netcoreapp3.1

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,4 @@ RestSharp.IntegrationTests/config.json
5151
/.vs/
5252
/node_modules/
5353
/out/
54+
/docs/.vuepress/dist/

.idea/.gitignore

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

RestSharp.sln

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ 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
2628
Global
2729
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2830
Debug.Appveyor|Any CPU = Debug.Appveyor|Any CPU
@@ -282,6 +284,36 @@ Global
282284
{6914F0EF-F6D2-4BE6-8477-553EBBFF3BEE}.Release|x64.Build.0 = Release|Any CPU
283285
{6914F0EF-F6D2-4BE6-8477-553EBBFF3BEE}.Release|x86.ActiveCfg = Release|Any CPU
284286
{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
285317
EndGlobalSection
286318
GlobalSection(SolutionProperties) = preSolution
287319
HideSolutionNode = FALSE
@@ -297,5 +329,6 @@ Global
297329
{8BF81225-2F85-4412-AD18-6579CBA1879B} = {9051DDA0-E563-45D5-9504-085EBAACF469}
298330
{D5DCF088-1126-4E6A-A175-CF8B6D5089A3} = {8C7B43EB-2F93-483C-B433-E28F9386AD67}
299331
{6914F0EF-F6D2-4BE6-8477-553EBBFF3BEE} = {8C7B43EB-2F93-483C-B433-E28F9386AD67}
332+
{859EEED2-83A4-44D1-98D9-CE3179BF7546} = {8C7B43EB-2F93-483C-B433-E28F9386AD67}
300333
EndGlobalSection
301334
EndGlobal

RestSharp.sln.DotSettings

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,19 @@
8282
<s:Boolean x:Key="/Default/UserDictionary/Words/=Mongo/@EntryIndexedValue">True</s:Boolean>
8383
<s:Boolean x:Key="/Default/UserDictionary/Words/=repcodes/@EntryIndexedValue">True</s:Boolean>
8484
<s:Boolean x:Key="/Default/UserDictionary/Words/=Serilog/@EntryIndexedValue">True</s:Boolean>
85-
<s:Boolean x:Key="/Default/UserDictionary/Words/=upsert/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
85+
<s:Boolean x:Key="/Default/UserDictionary/Words/=upsert/@EntryIndexedValue">True</s:Boolean>
86+
<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue"> Copyright © 2009-2020 John Sheehan, Andrew Young, Alexey Zimarev and RestSharp community
87+
88+
Licensed under the Apache License, Version 2.0 (the "License");
89+
you may not use this file except in compliance with the License.
90+
You may obtain a copy of the License at
91+
92+
http://www.apache.org/licenses/LICENSE-2.0
93+
94+
Unless required by applicable law or agreed to in writing, software
95+
distributed under the License is distributed on an "AS IS" BASIS,
96+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
97+
See the License for the specific language governing permissions and
98+
limitations under the License.
99+
</s:String>
100+
</wpf:ResourceDictionary>

docs/.vuepress/config.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,14 @@ module.exports = {
3838
children: [
3939
"/get-help/faq"
4040
]
41+
},
42+
{
43+
title: "Reference",
44+
path: "/api/",
45+
collapsable: true,
46+
children: [
47+
"/api/RestSharp.md"
48+
]
4149
}
4250
],
4351
searchPlaceholder: "Search...",
@@ -50,4 +58,4 @@ module.exports = {
5058
editLinks: true,
5159
editLinkText: "Help us by improving this page!"
5260
}
53-
}
61+
}

docs/api/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# API Reference
2+
3+
WIP

restsharp.png

7.39 KB
Loading

src/Directory.Build.props

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<Project>
2+
<PropertyGroup>
3+
<PackageReleaseNotes>For full release notes see https://github.com/restsharp/RestSharp/blob/master/releasenotes.md</PackageReleaseNotes>
4+
<PackageIcon>restsharp.png</PackageIcon>
5+
<PackageLicenseUrl>https://github.com/restsharp/RestSharp/blob/master/LICENSE.txt</PackageLicenseUrl>
6+
<PackageProjectUrl>http://restsharp.org</PackageProjectUrl>
7+
<RepositoryUrl>https://github.com/restsharp/RestSharp.git</RepositoryUrl>
8+
<RepositoryType>git</RepositoryType>
9+
<Description>Simple REST and HTTP API Client</Description>
10+
<Authors>John Sheehan, Andrew Young, Alexey Zimarev and RestSharp community</Authors>
11+
<Version>106.8.10</Version>
12+
<Optimize>true</Optimize>
13+
<AssemblyOriginatorKeyFile>..\..\RestSharp.snk</AssemblyOriginatorKeyFile>
14+
<SignAssembly>true</SignAssembly>
15+
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
16+
<UpdateVersionProperties>true</UpdateVersionProperties>
17+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
18+
<LangVersion>8</LangVersion>
19+
<IncludeSymbols>true</IncludeSymbols>
20+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
21+
</PropertyGroup>
22+
23+
<ItemGroup>
24+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
25+
<PackageReference Include="MinVer" Version="2.0.0" PrivateAssets="All" />
26+
</ItemGroup>
27+
28+
<ItemGroup>
29+
<None Include="..\restsharp.png" Pack="true" PackagePath="\"/>
30+
</ItemGroup>
31+
32+
<PropertyGroup>
33+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
34+
<NoWarn>$(NoWarn);1591</NoWarn>
35+
</PropertyGroup>
36+
</Project>
Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="../../netfx.props" />
3-
42
<PropertyGroup>
53
<TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
6-
<PackageReleaseNotes>For full release notes see https://github.com/restsharp/RestSharp/blob/master/releasenotes.md</PackageReleaseNotes>
7-
<PackageIconUrl>https://raw.githubusercontent.com/restsharp/RestSharp/master/docs/.vuepress/public/restsharp.png</PackageIconUrl>
8-
<PackageLicenseUrl>https://github.com/restsharp/RestSharp/blob/master/LICENSE.txt</PackageLicenseUrl>
9-
<PackageProjectUrl>http://restsharp.org</PackageProjectUrl>
10-
<RepositoryUrl>https://github.com/restsharp/RestSharp.git</RepositoryUrl>
11-
<RepositoryType>git</RepositoryType>
12-
<Description>Simple REST and HTTP API Client</Description>
13-
<Authors>John Sheehan, Andrew Young, Alexey Zimarev and RestSharp community</Authors>
14-
<Version>106.8.10</Version>
15-
<Optimize>true</Optimize>
16-
<AssemblyOriginatorKeyFile>..\..\RestSharp.snk</AssemblyOriginatorKeyFile>
17-
<SignAssembly>true</SignAssembly>
18-
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
19-
<UpdateVersionProperties>true</UpdateVersionProperties>
20-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
21-
<LangVersion>8</LangVersion>
22-
<IncludeSymbols>true</IncludeSymbols>
23-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
244
</PropertyGroup>
255

266
<ItemGroup>
27-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
28-
<PackageReference Include="MinVer" Version="2.0.0" PrivateAssets="All" />
297
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
308
</ItemGroup>
319

3210
<ItemGroup>
3311
<ProjectReference Include="..\RestSharp\RestSharp.csproj" />
3412
</ItemGroup>
3513

36-
<PropertyGroup>
37-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
38-
<NoWarn>$(NoWarn);1591</NoWarn>
39-
</PropertyGroup>
4014
</Project>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
5+
<IsPackable>false</IsPackable>
6+
<RootNamespace>RestSharp</RootNamespace>
7+
</PropertyGroup>
8+
9+
</Project>
Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="../../netfx.props" />
3-
42
<PropertyGroup>
53
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
6-
<PackageReleaseNotes>For full release notes see https://github.com/restsharp/RestSharp/blob/master/releasenotes.md</PackageReleaseNotes>
7-
<PackageIconUrl>https://raw.githubusercontent.com/restsharp/RestSharp/master/docs/.vuepress/public/restsharp.png</PackageIconUrl>
8-
<PackageLicenseUrl>https://github.com/restsharp/RestSharp/blob/master/LICENSE.txt</PackageLicenseUrl>
9-
<PackageProjectUrl>http://restsharp.org</PackageProjectUrl>
10-
<RepositoryUrl>https://github.com/restsharp/RestSharp.git</RepositoryUrl>
11-
<RepositoryType>git</RepositoryType>
12-
<Description>Simple REST and HTTP API Client</Description>
13-
<Authors>John Sheehan, Andrew Young, Alexey Zimarev and RestSharp community</Authors>
14-
<Version>106.8.10</Version>
15-
<Optimize>true</Optimize>
16-
<AssemblyOriginatorKeyFile>..\..\RestSharp.snk</AssemblyOriginatorKeyFile>
17-
<SignAssembly>true</SignAssembly>
18-
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
19-
<UpdateVersionProperties>true</UpdateVersionProperties>
20-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
21-
<LangVersion>8</LangVersion>
22-
<IncludeSymbols>true</IncludeSymbols>
23-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
244
</PropertyGroup>
255

266
<ItemGroup>
27-
<PackageReference Include="System.Text.Json" Version="4.7.0" />
28-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
29-
<PackageReference Include="MinVer" Version="2.0.0" PrivateAssets="All" />
7+
<PackageReference Include="System.Text.Json" Version="4.7.0"/>
308
</ItemGroup>
319

3210
<ItemGroup>
33-
<ProjectReference Include="..\RestSharp\RestSharp.csproj" />
11+
<ProjectReference Include="..\RestSharp\RestSharp.csproj"/>
3412
</ItemGroup>
3513

3614
</Project>
Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="../../netfx.props" />
3-
42
<PropertyGroup>
53
<TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
6-
<PackageReleaseNotes>For full release notes see https://github.com/restsharp/RestSharp/blob/master/releasenotes.md</PackageReleaseNotes>
7-
<PackageIconUrl>https://raw.githubusercontent.com/restsharp/RestSharp/master/docs/.vuepress/public/restsharp.png</PackageIconUrl>
8-
<PackageLicenseUrl>https://github.com/restsharp/RestSharp/blob/master/LICENSE.txt</PackageLicenseUrl>
9-
<PackageProjectUrl>http://restsharp.org</PackageProjectUrl>
10-
<RepositoryUrl>https://github.com/restsharp/RestSharp.git</RepositoryUrl>
11-
<RepositoryType>git</RepositoryType>
12-
<Description>Simple REST and HTTP API Client</Description>
13-
<Authors>John Sheehan, Andrew Young, Alexey Zimarev and RestSharp community</Authors>
14-
<Version>106.8.10</Version>
15-
<Optimize>true</Optimize>
16-
<AssemblyOriginatorKeyFile>..\..\RestSharp.snk</AssemblyOriginatorKeyFile>
17-
<SignAssembly>true</SignAssembly>
18-
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
19-
<UpdateVersionProperties>true</UpdateVersionProperties>
20-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
21-
<LangVersion>8</LangVersion>
22-
<IncludeSymbols>true</IncludeSymbols>
23-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
244
</PropertyGroup>
255

266
<ItemGroup>
27-
<PackageReference Include="Utf8Json" Version="1.3.7" />
28-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
29-
<PackageReference Include="MinVer" Version="2.0.0" PrivateAssets="All" />
7+
<PackageReference Include="Utf8Json" Version="1.3.7"/>
308
</ItemGroup>
319

3210
<ItemGroup>
33-
<ProjectReference Include="..\RestSharp\RestSharp.csproj" />
11+
<ProjectReference Include="..\RestSharp\RestSharp.csproj"/>
3412
</ItemGroup>
3513

3614
</Project>

src/RestSharp/Authenticators/HttpBasicAuthenticator.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#endregion
1818

1919
using System;
20-
using System.Linq;
2120
using System.Text;
2221

2322
namespace RestSharp.Authenticators

src/RestSharp/Authenticators/IAuthenticator.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
#region License
2-
3-
// Copyright © 2009-2020 John Sheehan, Andrew Young, Alexey Zimarev and RestSharp community
1+
// Copyright © 2009-2020 John Sheehan, Andrew Young, Alexey Zimarev and RestSharp community
42
//
53
// Licensed under the Apache License, Version 2.0 (the "License");
64
// you may not use this file except in compliance with the License.
@@ -14,8 +12,6 @@
1412
// See the License for the specific language governing permissions and
1513
// limitations under the License.
1614

17-
#endregion
18-
1915
namespace RestSharp.Authenticators
2016
{
2117
public interface IAuthenticator

src/RestSharp/Authenticators/JwtAuthenticator.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
#region License
2-
3-
// Author: Roman Kravchik
4-
// Based on HttpBasicAuthenticator class by John Sheehan
1+
// Copyright © 2009-2020 John Sheehan, Andrew Young, Alexey Zimarev and RestSharp community
52
//
63
// Licensed under the Apache License, Version 2.0 (the "License");
74
// you may not use this file except in compliance with the License.
@@ -15,8 +12,6 @@
1512
// See the License for the specific language governing permissions and
1613
// limitations under the License.
1714

18-
#endregion
19-
2015
using RestSharp.Validation;
2116

2217
namespace RestSharp.Authenticators

0 commit comments

Comments
 (0)