Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

UWP support #1084

Merged
merged 26 commits into from Sep 15, 2017
Merged

UWP support #1084

merged 26 commits into from Sep 15, 2017

Conversation

chrisdunelm
Copy link
Contributor

No description provided.

@googlebot googlebot added the cla: yes This human has signed the Contributor License Agreement. label Sep 6, 2017
@chrisdunelm
Copy link
Contributor Author

@jskeet please now take a look. It's quite large, but most of the changes are not too important.
Please can you especially check the csproj changes, and the new code to support UWP - UwpCodeReceiver.cs, PasswordVaultDataStore.cs, WindowsStorageDataStore.cs; and their tests.
Thanks

@chrisdunelm
Copy link
Contributor Author

@jskeet And note that this is going into its own branch (not master), so some later tidy-up/improvements is expected before it's merged into master.

@jskeet
Copy link
Collaborator

jskeet commented Sep 8, 2017

This is likely to be late next week, I'm afraid - but I'll get to it when I can.

@jskeet jskeet mentioned this pull request Sep 11, 2017
Closed
@cloud-sharp-jenkins
Copy link

Jenkins test comment

@cloud-sharp-jenkins
Copy link

Can one of the admins verify this patch?

@chrisdunelm
Copy link
Contributor Author

ok to test

@chrisdunelm chrisdunelm changed the title Initial UWP work. Many things still to do UWP support Sep 12, 2017
@chrisdunelm
Copy link
Contributor Author

@jskeet This is now complete, please can you review when you have time.
Sorry it's now so big. As said above, please especially check the csproj changes, and the new code to support UWP - UwpCodeReceiver.cs, PasswordVaultDataStore.cs, WindowsStorageDataStore.cs; and their tests.
I've got a new VS2017 build server ready, which can successfully build the new (support) packages containing UWP libraries. The generated libraries are unchanged, no special code is required for UWP.
The UWP integration test also passes.

@chrisdunelm
Copy link
Contributor Author

Updates #983

jskeet
jskeet approved these changes Sep 15, 2017
View reviewed changes
Copy link
Collaborator

@jskeet jskeet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few nits, but that's all.

Src/Support/CommonProjectProperties.xml Outdated
<IncludeSymbols>true</IncludeSymbols>
<IncludeSource>true</IncludeSource>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

<!-- -->

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Src/Support/CommonProjectProperties.xml Outdated
@@ -19,10 +19,13 @@
<SignAssembly>true</SignAssembly>
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<AssemblyOriginatorKeyFile>..\..\..\google.apis.snk</AssemblyOriginatorKeyFile>
<DebugType>portable</DebugType>
<DebugType>pdbonly</DebugType>
<DebugSymbols>true</DebugSymbols>

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Src/Support/Google.Apis.Auth/GoogleJsonWebSignature.cs Outdated
verifiedOk = googleCert.VerifyHash(hash, signature, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
#else
#error Unsupported platform
#error Unsupported target

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Src/Support/Google.Apis.Auth/OAuth2/UwpCodeReceiver.cs Outdated
public class UwpCodeReceiver : ICodeReceiver
{
/// <summary>
/// Exeception thrown on authention problems.

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Src/Support/Google.Apis.Auth/OAuth2/UwpCodeReceiver.cs Outdated
/// <summary>
/// Instantiate an <see cref="AuthenticateException"/>.
/// </summary>
/// <param name="msg"></param>

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Src/Support/Google.Apis/Util/Store/MemoryDataStore.cs Outdated
{
private static readonly Task s_completedTask = Task.FromResult(0);

internal static string GenerateStoredKey(string key, Type t) => string.Format("{0}-{1}", t.FullName, key);

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Src/Support/Google.Apis/Util/Store/MemoryDataStore.cs
/// <inheritdoc/>
public Task<T> GetAsync<T>(string key)
{
if (Items.TryGetValue(GenerateStoredKey(key, typeof(T)), out var value))

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Src/Support/Google.Apis/Util/Store/PasswordVaultDataStore.cs Outdated
vault.Remove(credential);
}
}
catch { }

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Src/Support/Google.Apis/Util/Store/WindowsStorageDataStore.cs Outdated
}
}

private static string GenerateStoredKey(string key, Type t) => string.Format("{0}-{1}", t.FullName, key);

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Src/Support/IntegrationTests/Program.cs
limitations under the License.
*/

// Why is this required?

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

@chrisdunelm chrisdunelm merged commit 0bcd13e into uwp Sep 15, 2017
@chrisdunelm chrisdunelm deleted the uwp0 branch September 18, 2017 12:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jskeet jskeet jskeet approved these changes

Assignees

@jskeet jskeet

Labels
cla: yes This human has signed the Contributor License Agreement.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@chrisdunelm @jskeet @cloud-sharp-jenkins @googlebot