Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 8fa7d9c

Browse files
paladiquepaladique
authored
Merge branch 'master' into fixes/969-missing-automation-ids
2 parents fa8aae8 + b439271 commit 8fa7d9c

File tree

184 files changed

+935
-1211
lines changed

Some content is hidden

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

184 files changed

+935
-1211
lines changed

‎.gitmodules‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[submodule "submodules/rothko"]
2-
path = submodules/rothko
3-
url = https://github.com/editor-tools/Rothko.git
41
[submodule "submodules/reactiveui"]
52
path = submodules/reactiveui
63
url = https://github.com/editor-tools/ReactiveUI

‎GitHubVS.sln‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.App", "src\GitHub.Ap
2727
EndProject
2828
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Submodules", "Submodules", "{1E7F7253-A6AF-43C4-A955-37BEDDA01AB8}"
2929
EndProject
30-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rothko", "submodules\Rothko\src\Rothko.csproj", "{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}"
31-
EndProject
3230
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{8E1F1B4E-AEA2-4AB1-8F73-423A903550A1}"
3331
ProjectSection(SolutionItems) = preProject
3432
script\Modules\BuildUtils.psm1 = script\Modules\BuildUtils.psm1
@@ -199,17 +197,6 @@ Global
199197
{1A1DA411-8D1F-4578-80A6-04576BEA2DC5}.Release|Any CPU.Build.0 = Release|Any CPU
200198
{1A1DA411-8D1F-4578-80A6-04576BEA2DC5}.Release|x86.ActiveCfg = Release|Any CPU
201199
{1A1DA411-8D1F-4578-80A6-04576BEA2DC5}.Release|x86.Build.0 = Release|Any CPU
202-
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Debug|Any CPU.ActiveCfg = Release|Any CPU
203-
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Debug|Any CPU.Build.0 = Release|Any CPU
204-
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Debug|x86.ActiveCfg = Release|Any CPU
205-
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Debug|x86.Build.0 = Release|Any CPU
206-
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Publish|Any CPU.ActiveCfg = Release|Any CPU
207-
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Publish|x86.ActiveCfg = Release|Any CPU
208-
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Publish|x86.Build.0 = Release|Any CPU
209-
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
210-
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Release|Any CPU.Build.0 = Release|Any CPU
211-
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Release|x86.ActiveCfg = Release|Any CPU
212-
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Release|x86.Build.0 = Release|Any CPU
213200
{9AEA02DB-02B5-409C-B0CA-115D05331A6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
214201
{9AEA02DB-02B5-409C-B0CA-115D05331A6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
215202
{9AEA02DB-02B5-409C-B0CA-115D05331A6B}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -479,7 +466,6 @@ Global
479466
EndGlobalSection
480467
GlobalSection(NestedProjects) = preSolution
481468
{596595A6-2A3C-469E-9386-9E3767D863A5} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFD}
482-
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB8}
483469
{8E1F1B4E-AEA2-4AB1-8F73-423A903550A1} = {7B6C5F8D-14B3-443D-B044-0E209AE12BDF}
484470
{1E7F7253-A6AF-43C4-A955-37BEDDA01AC0} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB8}
485471
{08DD4305-7787-4823-A53F-4D0F725A07F3} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AC0}

‎GitHubVS.v3.ncrunchsolution‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<SolutionConfiguration>
22
<Settings>
3+
<AdditionalFilesForGridProcessing>
4+
<Value>packages\Fody.1.29.4\**.*</Value>
5+
<Value>packages\EntryExitDecorator.Fody.0.3.0\**.*</Value>
6+
</AdditionalFilesForGridProcessing>
37
<AdditionalFilesToIncludeForSolution>
48
<Value>lib\**.*</Value>
59
</AdditionalFilesToIncludeForSolution>

‎lib/Rothko.0.0.2-ghfvs.nupkg‎

33.9 KB
Binary file not shown.

‎src/CredentialManagement/Credential.cs‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Security;
55
using System.Security.Permissions;
66
using System.Text;
7-
using NullGuard;
7+
using GitHub.Extensions;
88

99
namespace GitHub.Authentication.CredentialManagement
1010
{
@@ -35,9 +35,9 @@ public Credential() : this(null, (string)null)
3535
{}
3636

3737
public Credential(
38-
[AllowNull]string username,
39-
[AllowNull]SecureString password,
40-
[AllowNull]string target = null)
38+
string username,
39+
SecureString password,
40+
string target = null)
4141
{
4242
Username = username;
4343
SecurePassword = password;
@@ -48,9 +48,9 @@ public Credential(
4848
}
4949

5050
public Credential(
51-
[AllowNull]string username,
52-
[AllowNull]string password,
53-
[AllowNull]string target = null)
51+
string username,
52+
string password,
53+
string target = null)
5454
{
5555
Username = username;
5656
Password = password;
@@ -86,10 +86,8 @@ private void CheckNotDisposed()
8686
}
8787
}
8888

89-
[AllowNull]
9089
public string Username
9190
{
92-
[return: AllowNull]
9391
get
9492
{
9593
CheckNotDisposed();
@@ -102,10 +100,8 @@ public string Username
102100
}
103101
}
104102

105-
[AllowNull]
106103
public string Password
107104
{
108-
[return: AllowNull]
109105
get
110106
{
111107
return SecureStringHelper.CreateString(SecurePassword);
@@ -117,7 +113,6 @@ public string Password
117113
}
118114
}
119115

120-
[AllowNull]
121116
public SecureString SecurePassword
122117
{
123118
get
@@ -138,10 +133,8 @@ public SecureString SecurePassword
138133
}
139134
}
140135

141-
[AllowNull]
142136
public string Target
143137
{
144-
[return: AllowNull]
145138
get
146139
{
147140
CheckNotDisposed();
@@ -154,10 +147,8 @@ public string Target
154147
}
155148
}
156149

157-
[AllowNull]
158150
public string Description
159151
{
160-
[return: AllowNull]
161152
get
162153
{
163154
CheckNotDisposed();
@@ -245,6 +236,8 @@ public bool Save()
245236

246237
public bool Save(byte[] passwordBytes)
247238
{
239+
Guard.ArgumentNotNull(passwordBytes, nameof(passwordBytes));
240+
248241
CheckNotDisposed();
249242
_unmanagedCodePermission.Demand();
250243

@@ -340,6 +333,8 @@ internal void LoadInternal(NativeMethods.CREDENTIAL credential)
340333

341334
static void ValidatePasswordLength(byte[] passwordBytes)
342335
{
336+
Guard.ArgumentNotNull(passwordBytes, nameof(passwordBytes));
337+
343338
if (passwordBytes.Length > maxPasswordLengthInBytes)
344339
{
345340
var message = string.Format(CultureInfo.InvariantCulture,

‎src/CredentialManagement/CredentialManagement.csproj‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@
3838
<DelaySign>false</DelaySign>
3939
</PropertyGroup>
4040
<ItemGroup>
41-
<Reference Include="NullGuard, Version=1.4.6.0, Culture=neutral, PublicKeyToken=1958ac8092168428, processorArchitecture=MSIL">
42-
<HintPath>..\..\packages\NullGuard.Fody.1.4.6\Lib\dotnet\NullGuard.dll</HintPath>
43-
<Private>False</Private>
44-
</Reference>
4541
<Reference Include="System" />
4642
<Reference Include="System.Core" />
4743
<Reference Include="System.Xml.Linq" />
@@ -66,26 +62,13 @@
6662
<Compile Include="SecureStringHelper.cs" />
6763
<Compile Include="Properties\AssemblyInfo.cs" />
6864
</ItemGroup>
69-
<ItemGroup>
70-
<Content Include="FodyWeavers.xml" />
71-
</ItemGroup>
72-
<ItemGroup>
73-
<None Include="packages.config" />
74-
</ItemGroup>
7565
<ItemGroup>
7666
<ProjectReference Include="..\GitHub.Extensions\GitHub.Extensions.csproj">
7767
<Project>{6afe2e2d-6db0-4430-a2ea-f5f5388d2f78}</Project>
7868
<Name>GitHub.Extensions</Name>
7969
</ProjectReference>
8070
</ItemGroup>
8171
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
82-
<Import Project="..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="Exists('..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" />
83-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
84-
<PropertyGroup>
85-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
86-
</PropertyGroup>
87-
<Error Condition="!Exists('..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets'))" />
88-
</Target>
8972
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
9073
Other similar extension points exist, see Microsoft.Common.targets.
9174
<Target Name="BeforeBuild">

‎src/CredentialManagement/FodyWeavers.xml‎

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

‎src/CredentialManagement/packages.config‎

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

‎src/DesignTimeStyleHelper/DesignTimeStyleHelper.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@
4747
<Reference Include="Moq">
4848
<HintPath>..\..\packages\Moq.4.2.1312.1319\lib\net40\Moq.dll</HintPath>
4949
</Reference>
50+
<Reference Include="rothko, Version=0.0.2.0, Culture=neutral, PublicKeyToken=9f664c41f503810a, processorArchitecture=MSIL">
51+
<HintPath>..\..\packages\Rothko.0.0.2-ghfvs\lib\net45\rothko.dll</HintPath>
52+
<Private>True</Private>
53+
</Reference>
5054
<Reference Include="System" />
5155
<Reference Include="System.ComponentModel.Composition" />
5256
<Reference Include="System.Data" />
@@ -148,10 +152,6 @@
148152
<None Include="App.config" />
149153
</ItemGroup>
150154
<ItemGroup>
151-
<ProjectReference Include="..\..\submodules\Rothko\src\Rothko.csproj">
152-
<Project>{4a84e568-ca86-4510-8cd0-90d3ef9b65f9}</Project>
153-
<Name>Rothko</Name>
154-
</ProjectReference>
155155
<ProjectReference Include="..\GitHub.Api\GitHub.Api.csproj">
156156
<Project>{b389adaf-62cc-486e-85b4-2d8b078df763}</Project>
157157
<Name>GitHub.Api</Name>

‎src/DesignTimeStyleHelper/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<packages>
33
<package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="10.0.30319" targetFramework="net461" />
44
<package id="Moq" version="4.2.1312.1319" targetFramework="net45" userInstalled="true" />
5+
<package id="Rothko" version="0.0.2-ghfvs" targetFramework="net461" />
56
<package id="Rx-Core" version="2.2.5-custom" targetFramework="net45" userInstalled="true" />
67
<package id="Rx-Interfaces" version="2.2.5-custom" targetFramework="net45" userInstalled="true" />
78
<package id="Rx-Linq" version="2.2.5-custom" targetFramework="net45" userInstalled="true" />

0 commit comments

Comments
 (0)