Merge branch 'master' into fixes/reduce-auth-scope

StanleyGoldman · web-flow · commit 1f3696ede5ee · 2018-06-29T07:38:24.000-04:00
diff --git a/common/SolutionInfo.cs b/common/SolutionInfo.cs
@@ -34,6 +34,6 @@ internal static class AssemblyVersionInformation {
         // this is for the AssemblyVersion and AssemblyVersion attributes, which can't handle alphanumerics
         internal const string VersionForAssembly = "1.0.0";
         // Actual real version
-        internal const string Version = "1.0.0rc5";
+        internal const string Version = "1.0.0";
     }
 }
diff --git a/docs/using/images/branches-initial-view.png b/docs/using/images/branches-initial-view.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:558821e67ea26955434da0485785e9240b6c15c44a3790b642fdcd37382e56a2
+size 59798
diff --git a/docs/using/images/changes-view.png b/docs/using/images/changes-view.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2ac4637a222a06e6ab57f23082b8e8b2f5cb9e35b9b99776c112ddcebb923dec
+size 61918
diff --git a/docs/using/images/confirm-pull-changes.png b/docs/using/images/confirm-pull-changes.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4b0e1aa1d8d86cb0264c9ca569a5c8e71b0aba73a2eb6611c06ec47670037d7d
+size 21478
diff --git a/docs/using/images/confirm-push-changes.png b/docs/using/images/confirm-push-changes.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9e2e136027b03609f344bfde0c777d8e915544a5e9920f1268e4cc3abc5b1481
+size 18676
diff --git a/docs/using/images/confirm-revert.png b/docs/using/images/confirm-revert.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ba990ce12403bfb53fb387ca3f3e2c447b21814ed6cd7e6f88d968463a5253a8
+size 21973
diff --git a/docs/using/images/create-new-branch-view.png b/docs/using/images/create-new-branch-view.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f0239a51f611501dc63c828de206f35d412493871f65e712983666e67dbfc231
+size 62046
diff --git a/docs/using/images/delete-dialog.png b/docs/using/images/delete-dialog.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:99d7cd8ef4957614cc844a08a632159157295414dc4675c1394f3209e30ffa58
+size 76315
diff --git a/docs/using/images/name-branch.png b/docs/using/images/name-branch.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:08232fa5cfd41a41c8091197ac27f433fdfa865c4996388dd0c731ac75176442
+size 59599
diff --git a/docs/using/images/new-branch-created.png b/docs/using/images/new-branch-created.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8543da247ee23364c15abec87e4e3de3e62b85a470e7d3d090ade18fb321072c
+size 64045
diff --git a/docs/using/images/post-commit-view.png b/docs/using/images/post-commit-view.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:91e26123236bdd3e692ca7d30ff0d6477311fe739d8008ba19fd543ee3506176
+size 21345
diff --git a/docs/using/images/post-push-history-view.png b/docs/using/images/post-push-history-view.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c0c2d5ccaddc88d3268e0d57f02229525240ecc71bded951e23171456560268b
+size 22485
diff --git a/docs/using/images/pull-view.png b/docs/using/images/pull-view.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:feb83a46ebdd34ff46db3a38e8829f5adec5b10824bf69a8c56c9ba6fbd603ff
+size 25054
diff --git a/docs/using/images/push-view.png b/docs/using/images/push-view.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ab87bae0916af3681b7528891a359c77597fa3ea57f13eb6924f1cbcf2f2ab7d
+size 14581
diff --git a/docs/using/images/revert-commit.png b/docs/using/images/revert-commit.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b7711f428f3e04ea056c47b5d43109f3941761f4c286360d3616e0598d2d7b75
+size 26119
diff --git a/docs/using/images/revert.png b/docs/using/images/revert.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dea7b36eec8e2d99e1906b6cbc9cd22f52d2db09cc1a0cf34563585720b6649d
+size 25141
diff --git a/docs/using/images/success-pull-changes.png b/docs/using/images/success-pull-changes.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e0407ab83ca311f319ff7feac0dac84b862935e2b50353ff82c067bdadf80e16
+size 16888
diff --git a/docs/using/images/success-push-changes.png b/docs/using/images/success-push-changes.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cfd290cb1e52b0acb5503642a3aaef164bf343735729325484e25d8b99293d7e
+size 13262
diff --git a/docs/using/images/switch-confirmation.png b/docs/using/images/switch-confirmation.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4ed80f5cf2fab5fd256dd7cd093ad505c966edb95bdc5a15c3f1ace042bec7f6
+size 73947
diff --git a/docs/using/images/switch-or-delete.png b/docs/using/images/switch-or-delete.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8c0d171b2e8f7e212f2446b416235c6232c57c9b4927cfa41891bffa1940ae9d
+size 73828
diff --git a/docs/using/images/switched-branches.png b/docs/using/images/switched-branches.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:542806a8dcc012cdfadadaf9cdab3cf4871bbbbee2c8d73834946df4ed249aec
+size 64281
diff --git a/docs/using/managing-branches.md b/docs/using/managing-branches.md
@@ -0,0 +1,38 @@
+# Managing branches
+
+Initial **Branches** view
+
+<img src="images/branches-initial-view.png" alt="Post commit view"/>
+
+## Create branch
+
+1. From the **Branches** view, click on `master` under local branches to enable the `New Branch` button and be able to create a new branch from master.
+2. Click on `New Branch`.
+<img src="images/create-new-branch-view.png" alt="Post commit view"/>
+
+3. Enter a name for the branch and click `Create`.
+<img src="images/name-branch.png" alt="Post commit view"/>
+
+4. The new branch will be created from master.
+<img src="images/new-branch-created.png" alt="Post commit view"/>
+
+## Checkout branch
+
+1. Right-click on a local branch and select `Switch` or double-click on the branch to switch to it.
+<img src="images/switch-or-delete.png" alt="Post commit view"/>
+
+2. A dialog will appear asking `Switch branch to 'branch name'?`. Select `Switch`.
+<img src="images/switch-confirmation.png" alt="Post commit view"/>
+
+The branch will be checked out.
+<img src="images/switched-branches.png" alt="Post commit view"/>
+
+## Delete branches
+
+1. Click on the branch name to be deleted and the `Delete` button becomes enabled.
+2. Right-click on a local branch and select `Delete` or click the `Delete` button above the Local branches list.
+<img src="images/switch-or-delete.png" alt="Post commit view"/>
+
+3. A dialog appears asking `Are you sure you want to delete the branch: 'branch name'?`. Select `Delete`.
+
+The branch will be deleted.
diff --git a/docs/using/working-with-changes.md b/docs/using/working-with-changes.md
@@ -0,0 +1,53 @@
+# Working with changes
+
+## Commit changes to GitHub
+
+All changes made to a repository will show up under the **Changes** view.
+
+1. Select the changes to be committed. Can choose the All/None options, or select directories or files individually.
+2. Enter a Commit summary which describes the purpose of the commit. An optional Commit description can also be entered.
+3. Click the button `Commit to [branch name]`.
+<img src="images/changes-view.png" alt="Changes view"/>
+
+The commit will not be shown under the **History** view. On the top bar the button `Push (1)` indicates that there is 1 commit to push.
+
+<img src="images/post-commit-view.png" alt="Post commit view"/>
+
+## Push changes to GitHub
+
+1. Click `Push` once ready to push a commit to GitHub.
+<img src="images/push-view.png" alt="Push view"/>
+
+2. A dialog will appear asking `Would you like to push changes to remote 'branch name'?` Select `Push`.
+<img src="images/confirm-push-changes.png" alt="Confirm push dialog"/>
+
+3. Another dialog will appear when the push to GitHub is complete saying `Branch pushed`. Select `ok`.
+<img src="images/success-push-changes.png" alt="Branch pushed"/>
+
+##  Revert changes
+
+1. From the **History** view, right-click on a commit in the commit list. A `Revert` option will appear.
+2. Click `Revert`.
+<img src="images/revert.png" alt="Revert"/>
+
+3. A dialog will appear asking `Are you sure you want to revert the following commit: "commit message"?`. Select `Revert`.
+<img src="images/confirm-revert.png" alt="Confirm revert dialog"/>
+
+4. A new commit appears titled `Revert "commit summary"` and the view indicates that there is 1 commit to push.
+<img src="images/revert-commit.png" alt="Revert commit"/>
+
+5. Follow the steps to push the reverted commit to GitHub.
+
+## Pulling changes
+
+1. Click the `Fetch` button to get all the latest branches and tags for the repository. The `Pull` button will then show the number of commits to pull from GitHub.
+2. Click `Pull`.
+<img src="images/pull-view.png" alt="Pull changes"/>
+
+3. A dialog will appear asking `Would you like to pull changes from remote 'branch name'?`. Select `Pull`.
+<img src="images/confirm-pull-changes.png" alt="Confirm pull changes dialog"/>
+
+4. Another dialog appears saying `Local branch is up to date with 'branch name'`. Select `ok`. 
+<img src="images/success-pull-changes.png" alt="Changes pulled"/>
+
+
diff --git a/src/GitHub.Api/Git/Repository.cs b/src/GitHub.Api/Git/Repository.cs
@@ -188,6 +188,12 @@ public void Refresh(CacheType cacheType)
         {
             var cache = cacheContainer.GetCache(cacheType);
             cache.InvalidateData();
+
+            // take the opportunity to possibly refresh the locks cache, if it has timed out
+            if (cacheType != CacheType.GitLocks)
+            {
+                cacheContainer.GetCache(CacheType.GitLocks).ValidateData();
+            }
         }
 
         private void CacheHasBeenInvalidated(CacheType cacheType)
diff --git a/src/GitHub.Api/Helpers/Constants.cs b/src/GitHub.Api/Helpers/Constants.cs
@@ -14,10 +14,22 @@ static class Constants
         public const string Iso8601Format = @"yyyy-MM-dd\THH\:mm\:ss.fffzzz";
         public const string Iso8601FormatZ = @"yyyy-MM-dd\THH\:mm\:ss\Z";
         public static readonly string[] Iso8601Formats = {
+            Iso8601Format,
             Iso8601FormatZ,
             @"yyyy-MM-dd\THH\:mm\:ss.fffffffzzz",
-            Iso8601Format,
+            @"yyyy-MM-dd\THH\:mm\:ss.ffffffzzz",
+            @"yyyy-MM-dd\THH\:mm\:ss.fffffzzz",
+            @"yyyy-MM-dd\THH\:mm\:ss.ffffzzz",
+            @"yyyy-MM-dd\THH\:mm\:ss.ffzzz",
+            @"yyyy-MM-dd\THH\:mm\:ss.fzzz",
             @"yyyy-MM-dd\THH\:mm\:sszzz",
+            @"yyyy-MM-dd\THH\:mm\:ss.fffffff\Z",
+            @"yyyy-MM-dd\THH\:mm\:ss.ffffff\Z",
+            @"yyyy-MM-dd\THH\:mm\:ss.fffff\Z",
+            @"yyyy-MM-dd\THH\:mm\:ss.ffff\Z",
+            @"yyyy-MM-dd\THH\:mm\:ss.fff\Z",
+            @"yyyy-MM-dd\THH\:mm\:ss.ff\Z",
+            @"yyyy-MM-dd\THH\:mm\:ss.f\Z",
         };
         public const DateTimeStyles DateTimeStyle = DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal;
         public const string SkipVersionKey = "SkipVersion";
diff --git a/src/GitHub.Api/Helpers/SimpleJson.cs b/src/GitHub.Api/Helpers/SimpleJson.cs
@@ -1250,17 +1250,7 @@ class PocoJsonSerializerStrategy : IJsonSerializerStrategy
         internal static readonly Type[] EmptyTypes = new Type[0];
         internal static readonly Type[] ArrayConstructorParameterTypes = new Type[] { typeof(int) };
 
-        private static readonly string[] Iso8601Format = new string[]
-                                                             {
-                                                                @"yyyy-MM-dd\THH\:mm\:sszzz",
-                                                                @"yyyy-MM-dd\THH\:mm\:ss.fffffffzzz",
-                                                                @"yyyy-MM-dd\THH\:mm\:ss.fffzzz",
-                                                                @"yyyy-MM-dd\THH\:mm\:ss\Z",
-                                                                @"yyyy-MM-dd\THH:mm:ss.fffffffzzz",
-                                                                @"yyyy-MM-dd\THH:mm:ss.fffzzz",
-                                                                @"yyyy-MM-dd\THH:mm:sszzz",
-                                                                @"yyyy-MM-dd\THH:mm:ss\Z",
-                                                             };
+        private static readonly string[] Iso8601Format = Constants.Iso8601Formats;
 
         public PocoJsonSerializerStrategy()
         {
diff --git a/src/tests/UnitTests/IO/LockOutputProcessorTests.cs b/src/tests/UnitTests/IO/LockOutputProcessorTests.cs
@@ -68,6 +68,25 @@ public void ShouldParseTwoLocksFormat()
                 new GitLock("2f9cfde9c159d50e235cc1402c3e534b0bf2198afb20760697a5f9b07bf04fb3", "somezip.zip".ToNPath(), new GitUser("GitHub User", ""), now)
             };
 
+            AssertProcessOutput(output, expected);
+        }
+
+        [Test]
+        public void ShouldParseVSTSLocksFormat()
+        {
+            var nowString = DateTimeOffset.UtcNow.ToString(@"yyyy-MM-dd\THH\:mm\:ss.ff\Z");
+            var now = DateTimeOffset.ParseExact(nowString, Constants.Iso8601Formats, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal);
+            var output = new[]
+            {
+                $@"[{{""id"":""7""   ,""path"":""Assets/Main.unity"",""owner"":{{""name"":""GitHub User""}},""locked_at"":""{nowString}""}}]",
+                string.Empty,
+                "1 lock(s) matched query.",
+                null
+            };
+
+            var expected = new[] {
+                new GitLock("7", "Assets/Main.unity".ToNPath(), new GitUser("GitHub User", ""), now),
+            };
 
             AssertProcessOutput(output, expected);
         }
diff --git a/src/tests/UnitTests/Primitives/SerializationTests.cs b/src/tests/UnitTests/Primitives/SerializationTests.cs
@@ -11,6 +11,41 @@ namespace UnitTests.Primitives
     [TestFixture]
     class SerializationTests
     {
+        [TestCase("2018-05-01T12:04:29.1234567-02:00", "2018-05-01T14:04:29.123+00:00")]
+        [TestCase("2018-05-01T12:04:29.123456-02:00", "2018-05-01T14:04:29.123+00:00")]
+        [TestCase("2018-05-01T12:04:29.12345-02:00", "2018-05-01T14:04:29.123+00:00")]
+        [TestCase("2018-05-01T12:04:29.1234-02:00", "2018-05-01T14:04:29.123+00:00")]
+        [TestCase("2018-05-01T12:04:29.123-02:00", "2018-05-01T14:04:29.123+00:00")]
+        [TestCase("2018-05-01T12:04:29.12-02:00", "2018-05-01T14:04:29.120+00:00")]
+        [TestCase("2018-05-01T12:04:29.1-02:00", "2018-05-01T14:04:29.100+00:00")]
+        [TestCase("2018-05-01T12:04:29-02:00", "2018-05-01T14:04:29.000+00:00")]
+        [TestCase("2018-05-01T12:04:29.1234567Z", "2018-05-01T12:04:29.123+00:00")]
+        [TestCase("2018-05-01T12:04:29.123456Z", "2018-05-01T12:04:29.123+00:00")]
+        [TestCase("2018-05-01T12:04:29.12345Z", "2018-05-01T12:04:29.123+00:00")]
+        [TestCase("2018-05-01T12:04:29.1234Z", "2018-05-01T12:04:29.123+00:00")]
+        [TestCase("2018-05-01T12:04:29.123Z", "2018-05-01T12:04:29.123+00:00")]
+        [TestCase("2018-05-01T12:04:29.12Z", "2018-05-01T12:04:29.120+00:00")]
+        [TestCase("2018-05-01T12:04:29.1Z", "2018-05-01T12:04:29.100+00:00")]
+        [TestCase("2018-05-01T12:04:29Z", "2018-05-01T12:04:29.000+00:00")]
+        public void FromLocalStringToUniversalDateTimeOffset(string input, string expected)
+        {
+            var dtInput = DateTimeOffset.ParseExact(input, Constants.Iso8601Formats, CultureInfo.InvariantCulture, Constants.DateTimeStyle);
+            var output = dtInput.ToUniversalTime().ToString(Constants.Iso8601Format);
+            Assert.AreEqual(expected, output);
+
+            var json = $@"{{""date"":""{input}""}}";
+            Assert.DoesNotThrow(() => json.FromJson<ADateTimeOffset>(lowerCase: true));
+        }
+
+        [Test]
+        public void JsonSerializationUsesKnownFormat()
+        {
+            var now = DateTimeOffset.Now;
+            var output = new ADateTimeOffset { Date = now };
+            var json = output.ToJson(lowerCase: true);
+            Assert.AreEqual($@"{{""date"":""{ now.ToUniversalTime().ToString(Constants.Iso8601Format, CultureInfo.InvariantCulture) }""}}", json);
+        }
+
         [Test]
         public void DateTimeSerializationRoundTrip()
         {
@@ -37,6 +72,27 @@ public void DateTimeSerializationRoundTrip()
             Assert.AreEqual(dt3, dt4);
         }
 
+        [Test]
+        public void DateTimeSerializationRoundTripFormatPointZ()
+        {
+            var dt1 = DateTimeOffset.ParseExact("2018-05-01T15:04:29.00Z", Constants.Iso8601Formats, CultureInfo.InvariantCulture, Constants.DateTimeStyle);
+            var str1 = dt1.ToJson();
+            var ret1 = str1.FromJson<DateTimeOffset>();
+            Assert.AreEqual(dt1, ret1);
+
+            var dt2 = DateTimeOffset.ParseExact("2018-05-01T15:04:29Z", Constants.Iso8601Formats, CultureInfo.InvariantCulture, Constants.DateTimeStyle);
+            var str2 = dt2.ToJson();
+            var ret2 = str2.FromJson<DateTimeOffset>();
+            Assert.AreEqual(dt2, ret2);
+
+            Assert.AreEqual(dt1, dt2);
+        }
+
+        class ADateTimeOffset
+        {
+            public DateTimeOffset Date;
+        }
+
         class TestData
         {
             public List<string> Things { get; set; } = new List<string>();

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,6 @@ internal static class AssemblyVersionInformation {`
`34`	`34`	`// this is for the AssemblyVersion and AssemblyVersion attributes, which can't handle alphanumerics`
`35`	`35`	`internal const string VersionForAssembly = "1.0.0";`
`36`	`36`	`// Actual real version`
`37`		`- internal const string Version = "1.0.0rc5";`
	`37`	`+ internal const string Version = "1.0.0";`
`38`	`38`	`}`
`39`	`39`	`}`