Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit 8d47470

Browse files
shanashana
committed
Merge master into features/publish
2 parents d916e18 + bb0d6f1 commit 8d47470

File tree

107 files changed

+2036
-1541
lines changed

Some content is hidden

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

107 files changed

+2036
-1541
lines changed

‎GitHub.Unity.sln.DotSettings

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
22
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=C_0023/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="C#"&gt;&lt;CSReorderTypeMembers&gt;True&lt;/CSReorderTypeMembers&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="True" ArrangeBraces="True" ArrangeAttributes="True" ArrangeArgumentsStyle="True" /&gt;&lt;CSEnforceVarKeywordUsageSettings&gt;True&lt;/CSEnforceVarKeywordUsageSettings&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;/Profile&gt;</s:String>
3+
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Relayout/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Relayout"&gt;&lt;CSReorderTypeMembers&gt;True&lt;/CSReorderTypeMembers&gt;&lt;/Profile&gt;</s:String>
34
<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">C#</s:String>
45
<s:String x:Key="/Default/CodeStyle/CodeCleanup/SilentCleanupProfile/@EntryValue">C#</s:String>
56
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOR/@EntryValue">Required</s:String>
@@ -262,17 +263,6 @@
262263
&lt;ImplementsInterface Immediate="True" /&gt;&#xD;
263264
&lt;/Entry.SortBy&gt;&#xD;
264265
&lt;/Entry&gt;&#xD;
265-
&lt;Entry DisplayName="Other Static Methods" Priority="49"&gt;&#xD;
266-
&lt;Entry.Match&gt;&#xD;
267-
&lt;And&gt;&#xD;
268-
&lt;Kind Is="Method" /&gt;&#xD;
269-
&lt;Static /&gt;&#xD;
270-
&lt;/And&gt;&#xD;
271-
&lt;/Entry.Match&gt;&#xD;
272-
&lt;Entry.SortBy&gt;&#xD;
273-
&lt;Access /&gt;&#xD;
274-
&lt;/Entry.SortBy&gt;&#xD;
275-
&lt;/Entry&gt;&#xD;
276266
&lt;Entry DisplayName="Other Instance Methods" Priority="39"&gt;&#xD;
277267
&lt;Entry.Match&gt;&#xD;
278268
&lt;And&gt;&#xD;
@@ -300,6 +290,17 @@
300290
&lt;ImplementsInterface Immediate="True" /&gt;&#xD;
301291
&lt;/Entry.SortBy&gt;&#xD;
302292
&lt;/Entry&gt;&#xD;
293+
&lt;Entry DisplayName="Other Static Methods" Priority="49"&gt;&#xD;
294+
&lt;Entry.Match&gt;&#xD;
295+
&lt;And&gt;&#xD;
296+
&lt;Kind Is="Method" /&gt;&#xD;
297+
&lt;Static /&gt;&#xD;
298+
&lt;/And&gt;&#xD;
299+
&lt;/Entry.Match&gt;&#xD;
300+
&lt;Entry.SortBy&gt;&#xD;
301+
&lt;Access /&gt;&#xD;
302+
&lt;/Entry.SortBy&gt;&#xD;
303+
&lt;/Entry&gt;&#xD;
303304
&lt;Entry DisplayName="Dispose Implementation" Priority="100"&gt;&#xD;
304305
&lt;Entry.Match&gt;&#xD;
305306
&lt;Or&gt;&#xD;

‎common/GitHub.ruleset renamed to ‎common/codeanalysis-full.ruleset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<RuleSet Name="GitHub" Description="This ruleset only includes the rules we care about. I'll be adding new ones as we fix our codebase." ToolsVersion="14.0">
2+
<RuleSet Name="codeanalysis-full" Description="This ruleset only includes the rules we care about. I'll be adding new ones as we fix our codebase." ToolsVersion="14.0">
33
<IncludeAll Action="Warning" />
44
<Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
55
<Rule Id="CA1000" Action="None" />

‎common/codeanalysis-small.ruleset

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RuleSet Name="codeanalysis-small" Description="This ruleset only includes the rules we care about. I'll be adding new ones as we fix our codebase." ToolsVersion="14.0">
3+
<IncludeAll Action="Warning" />
4+
<Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
5+
<Rule Id="CA1000" Action="None" />
6+
<Rule Id="CA1002" Action="None" />
7+
<Rule Id="CA1006" Action="None" />
8+
<Rule Id="CA1014" Action="None" />
9+
<Rule Id="CA1017" Action="None" />
10+
<Rule Id="CA1020" Action="None" />
11+
<Rule Id="CA1021" Action="None" />
12+
<Rule Id="CA1024" Action="None" />
13+
<Rule Id="CA1026" Action="None" />
14+
<Rule Id="CA1030" Action="None" />
15+
<Rule Id="CA1031" Action="None" />
16+
<Rule Id="CA1033" Action="None" />
17+
<Rule Id="CA1034" Action="None" />
18+
<Rule Id="CA1045" Action="None" />
19+
<Rule Id="CA1051" Action="None" />
20+
<Rule Id="CA1054" Action="None" />
21+
<Rule Id="CA1055" Action="None" />
22+
<Rule Id="CA1056" Action="None" />
23+
<Rule Id="CA1062" Action="None" />
24+
<Rule Id="CA1063" Action="None" />
25+
<Rule Id="CA1303" Action="None" />
26+
<Rule Id="CA1305" Action="None" />
27+
<Rule Id="CA1307" Action="None" />
28+
<Rule Id="CA1401" Action="None" />
29+
<Rule Id="CA1402" Action="None" />
30+
<Rule Id="CA1403" Action="None" />
31+
<Rule Id="CA1405" Action="None" />
32+
<Rule Id="CA1406" Action="None" />
33+
<Rule Id="CA1407" Action="None" />
34+
<Rule Id="CA1408" Action="None" />
35+
<Rule Id="CA1409" Action="None" />
36+
<Rule Id="CA1410" Action="None" />
37+
<Rule Id="CA1411" Action="None" />
38+
<Rule Id="CA1412" Action="None" />
39+
<Rule Id="CA1413" Action="None" />
40+
<Rule Id="CA1501" Action="None" />
41+
<Rule Id="CA1502" Action="None" />
42+
<Rule Id="CA1506" Action="None" />
43+
<Rule Id="CA1701" Action="None" />
44+
<Rule Id="CA1702" Action="None" />
45+
<Rule Id="CA1703" Action="None" />
46+
<Rule Id="CA1704" Action="None" />
47+
<Rule Id="CA1707" Action="None" />
48+
<Rule Id="CA1708" Action="None" />
49+
<Rule Id="CA1709" Action="None" />
50+
<Rule Id="CA1710" Action="None" />
51+
<Rule Id="CA1711" Action="None" />
52+
<Rule Id="CA1712" Action="None" />
53+
<Rule Id="CA1713" Action="None" />
54+
<Rule Id="CA1714" Action="None" />
55+
<Rule Id="CA1715" Action="None" />
56+
<Rule Id="CA1716" Action="None" />
57+
<Rule Id="CA1717" Action="None" />
58+
<Rule Id="CA1719" Action="None" />
59+
<Rule Id="CA1720" Action="None" />
60+
<Rule Id="CA1721" Action="None" />
61+
<Rule Id="CA1722" Action="None" />
62+
<Rule Id="CA1724" Action="None" />
63+
<Rule Id="CA1725" Action="None" />
64+
<Rule Id="CA1726" Action="None" />
65+
<Rule Id="CA1800" Action="None" />
66+
<Rule Id="CA1801" Action="None" />
67+
<Rule Id="CA1810" Action="None" />
68+
<Rule Id="CA1811" Action="None" />
69+
<Rule Id="CA1812" Action="None" />
70+
<Rule Id="CA1822" Action="None" />
71+
<Rule Id="CA2000" Action="None" />
72+
<Rule Id="CA2118" Action="None" />
73+
<Rule Id="CA2122" Action="None" />
74+
<Rule Id="CA2200" Action="None" />
75+
<Rule Id="CA2201" Action="Warning" />
76+
<Rule Id="CA2204" Action="None" />
77+
<Rule Id="CA2210" Action="None" />
78+
<Rule Id="CA2211" Action="None" />
79+
<Rule Id="CA2213" Action="None" />
80+
<Rule Id="CA2227" Action="None" />
81+
<Rule Id="CA2235" Action="None" />
82+
<Rule Id="IDE001" Action="None" />
83+
84+
<!-- strings -->
85+
<Rule Id="CA1304" Action="None" />
86+
<Rule Id="CA1308" Action="None" />
87+
<Rule Id="CA1309" Action="None" />
88+
<Rule Id="CA1820" Action="None" />
89+
<Rule Id="CA1823" Action="None" />
90+
91+
<!-- serialization -->
92+
<Rule Id="CA2237" Action="None" />
93+
<Rule Id="CA1032" Action="None" />
94+
95+
<!-- link demand -->
96+
<Rule Id="CA2123" Action="None" />
97+
</Rules>
98+
<Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp.Features" RuleNamespace="Microsoft.CodeAnalysis.CSharp.Features">
99+
<Rule Id="IDE0001" Action="None" />
100+
</Rules>
101+
</RuleSet>

‎lib/AsyncBridge.Net35.0.2.3333.0.nupkg

22.5 KB
Binary file not shown.

‎lib/TaskParallelLibrary.1.0.3333.0.nupkg

1.65 MB
Binary file not shown.

‎lib/TunnelVisionLabs.Threading.2.0.0-unity.nupkg

17.3 KB
Binary file not shown.

‎lib/TunnelVisionLabs.Threading.2.0.0-unity.symbols.nupkg

65.4 KB
Binary file not shown.

‎lib/dotnet-httpClient35/System.Net.Http.dll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:420bdc3fdd9b3022f1a9a800a4e42709565ee64c0c88534259a6ea29f04f44ac
2+
oid sha256:5fd1e590c79fa453c5722bd645ef037d5f7748177bab14bd794981adc11a06a0
33
size 123904

‎lib/dotnet-httpClient35/System.Net.Http.dll.mdb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:88304fa5cbd985a284e69e1c01effd5dfb1cdfcd0b773925c2a77a88849e8d62
3-
size 46996
2+
oid sha256:df057b70add2c6488614a273236cb07d5b971026de36c5b9a3f044a547af75f2
3+
size 47752

‎lib/octokit.net/Octokit.dll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:5d7e1ac6cbe61853a11fd3acd9e9a9de263bcba30cbd9af9dca65df15166495c
2+
oid sha256:003fb61b6517b43d4ce412070bede800af20a161bcf8cb9cbcbac38aed1075da
33
size 741888

0 commit comments

Comments
 (0)