From c383e04c07b786530eb01afe43163140e9d9dcad Mon Sep 17 00:00:00 2001 From: noecald Date: Wed, 8 Apr 2020 13:31:15 -0700 Subject: [PATCH 01/18] added nuget.config --- azure-pipelines.yml | 5 ++--- nuget.config | 7 +++++++ 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 nuget.config diff --git a/azure-pipelines.yml b/azure-pipelines.yml index eb1a07a..0cd8cb1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -25,12 +25,11 @@ steps: command: build projects: "**/*.csproj" - task: MS-RichCodeNav.Indexer.build-task.RichCodeNavIndexer@0 - displayName: Rich Code Navigation Upload to Staging + displayName: Rich Code Navigation Upload to Dev inputs: - serviceConnection: 'richCodeNav-Token-Int' languages: 'csharp' githubServiceConnection: 'noellelc' - environment: staging + environment: development isPrivateFeed: false continueOnError: true - script: echo Adding a final line diff --git a/nuget.config b/nuget.config new file mode 100644 index 0000000..4401ce8 --- /dev/null +++ b/nuget.config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file From 56d1c616c7453fd3b9d2ac57caee5ddf4fb0bc83 Mon Sep 17 00:00:00 2001 From: noecald Date: Tue, 14 Apr 2020 09:08:54 -0700 Subject: [PATCH 02/18] squashing them --- .gitignore | 1 + azure-pipelines.yml | 7 +++---- nuget.config | 7 +++++++ 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 nuget.config diff --git a/.gitignore b/.gitignore index b0d5277..0dd28a5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .vscode/ bin/ obj/ +.vs/ diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 930aeab..0cd8cb1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -25,13 +25,12 @@ steps: command: build projects: "**/*.csproj" - task: MS-RichCodeNav.Indexer.build-task.RichCodeNavIndexer@0 - displayName: Rich Code Navigation Upload to Staging + displayName: Rich Code Navigation Upload to Dev inputs: - serviceConnection: 'richCodeNav-Token-Int' languages: 'csharp' githubServiceConnection: 'noellelc' - environment: staging + environment: development isPrivateFeed: false continueOnError: true --script: echo Adding a final line +- script: echo Adding a final line diff --git a/nuget.config b/nuget.config new file mode 100644 index 0000000..4401ce8 --- /dev/null +++ b/nuget.config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file From 777bb022f205bed29d3302d922d7ebe391502e9e Mon Sep 17 00:00:00 2001 From: noecald Date: Tue, 14 Apr 2020 09:43:43 -0700 Subject: [PATCH 03/18] add multiply --- Calculator.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Calculator.cs b/Calculator.cs index 1630f17..33e269b 100644 --- a/Calculator.cs +++ b/Calculator.cs @@ -11,5 +11,10 @@ public int Subtract(int a, int b) { return a - b; } + + public int Multiply(int a, int b) + { + return a * b; + } } } \ No newline at end of file From 858d34bc4c1698806fa8c6f336a4f4c042fe0742 Mon Sep 17 00:00:00 2001 From: noecald Date: Tue, 14 Apr 2020 09:44:12 -0700 Subject: [PATCH 04/18] add divide --- Calculator.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Calculator.cs b/Calculator.cs index 33e269b..6a126bc 100644 --- a/Calculator.cs +++ b/Calculator.cs @@ -16,5 +16,10 @@ public int Multiply(int a, int b) { return a * b; } + + public double Divide(int a, int b) + { + return a/b; + } } } \ No newline at end of file From fc8466c644d9178c43697140c9da6efd2c5e2958 Mon Sep 17 00:00:00 2001 From: noecald Date: Tue, 14 Apr 2020 09:44:56 -0700 Subject: [PATCH 05/18] add calls --- Program.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Program.cs b/Program.cs index 3e7a7b6..1e93143 100644 --- a/Program.cs +++ b/Program.cs @@ -12,6 +12,8 @@ static void Main(string[] args) Console.WriteLine($"2 + 3 = {calc.Add(2,3)}"); Console.WriteLine($"12 - 3 = {calc.Subtract(12,3)}"); + Console.WriteLine($"12 * 3 = {calc.Multiply(12,3)}"); + Console.WriteLine($"12 / 3 = {calc.Divide(12,3)}"); } } } From 91291f619d050baa3dd53d7d55f73ae678335466 Mon Sep 17 00:00:00 2001 From: noecald Date: Thu, 16 Apr 2020 12:30:39 -0700 Subject: [PATCH 06/18] clean up --- SampleApp.csproj | 1 + nuget.config | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 nuget.config diff --git a/SampleApp.csproj b/SampleApp.csproj index c73e0d1..9ae1a78 100644 --- a/SampleApp.csproj +++ b/SampleApp.csproj @@ -3,6 +3,7 @@ Exe netcoreapp3.1 + true diff --git a/nuget.config b/nuget.config deleted file mode 100644 index 4401ce8..0000000 --- a/nuget.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file From 7a4e173d0cc20fed6db925a8cb756fc72213301b Mon Sep 17 00:00:00 2001 From: noecald Date: Thu, 16 Apr 2020 12:31:14 -0700 Subject: [PATCH 07/18] remove nuget.config --- nuget.config | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 nuget.config diff --git a/nuget.config b/nuget.config deleted file mode 100644 index 4401ce8..0000000 --- a/nuget.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file From 032b1a679c3d59a9d54eae59a125a26e545f76f9 Mon Sep 17 00:00:00 2001 From: noecald Date: Tue, 12 May 2020 13:58:02 -0700 Subject: [PATCH 08/18] added power function --- Calculator.cs | 7 +++++++ Program.cs | 1 + 2 files changed, 8 insertions(+) diff --git a/Calculator.cs b/Calculator.cs index 6a126bc..c9d8842 100644 --- a/Calculator.cs +++ b/Calculator.cs @@ -1,3 +1,5 @@ +using System; + namespace SampleApp { public class Calculator @@ -21,5 +23,10 @@ public double Divide(int a, int b) { return a/b; } + + public double Power(int a, int b) + { + return Math.Pow(a, b); + } } } \ No newline at end of file diff --git a/Program.cs b/Program.cs index 1e93143..9245d5e 100644 --- a/Program.cs +++ b/Program.cs @@ -14,6 +14,7 @@ static void Main(string[] args) Console.WriteLine($"12 - 3 = {calc.Subtract(12,3)}"); Console.WriteLine($"12 * 3 = {calc.Multiply(12,3)}"); Console.WriteLine($"12 / 3 = {calc.Divide(12,3)}"); + Console.WriteLine($"12 ^ 3 = {calc.Power(12,3)}"); } } } From 46f9db84d62d4a491a526ff2595a74e3f95d575e Mon Sep 17 00:00:00 2001 From: Noelle Caldwell Date: Tue, 12 May 2020 14:22:52 -0700 Subject: [PATCH 09/18] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 55423b5..e218ae3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -18,7 +18,7 @@ steps: displayName: 'Use .NET Core sdk' inputs: packageType: sdk - version: 2.x + version: 3.x - task: DotNetCoreCLI@2 inputs: command: restore From 7a8b8cb5867bec1ee3105db904476bf13bf464ac Mon Sep 17 00:00:00 2001 From: noecald Date: Tue, 12 May 2020 14:30:05 -0700 Subject: [PATCH 10/18] updated .netcore framework --- SampleApp.csproj | 2 +- azure-pipelines.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SampleApp.csproj b/SampleApp.csproj index 9ae1a78..cd66476 100644 --- a/SampleApp.csproj +++ b/SampleApp.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + netcoreapp2.1 true diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e218ae3..55423b5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -18,7 +18,7 @@ steps: displayName: 'Use .NET Core sdk' inputs: packageType: sdk - version: 3.x + version: 2.x - task: DotNetCoreCLI@2 inputs: command: restore From 5e4bf81577c071091645c73efcd35eabf9b76d74 Mon Sep 17 00:00:00 2001 From: noecald Date: Tue, 12 May 2020 14:34:44 -0700 Subject: [PATCH 11/18] updated build host --- SampleApp.csproj | 2 +- azure-pipelines.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SampleApp.csproj b/SampleApp.csproj index cd66476..9ae1a78 100644 --- a/SampleApp.csproj +++ b/SampleApp.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.1 + netcoreapp3.1 true diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 55423b5..f516825 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,7 +10,7 @@ trigger: exclude: ["*.md"] queue: - name: Hosted VS2017 + name: Hosted Windows 2019 with VS2019 timeoutInMinutes: 60 steps: @@ -18,7 +18,7 @@ steps: displayName: 'Use .NET Core sdk' inputs: packageType: sdk - version: 2.x + version: 3.x - task: DotNetCoreCLI@2 inputs: command: restore From 1d6795fae1225c8c306c6ec3d566463049c67ead Mon Sep 17 00:00:00 2001 From: Noelle Caldwell Date: Tue, 12 May 2020 16:13:37 -0700 Subject: [PATCH 12/18] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f516825..bb67305 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -34,7 +34,7 @@ steps: languages: 'csharp' githubServiceConnection: 'noellelc' environment: development - isPrivateFeed: false + nugetVersion: '0.1.1465-alpha' continueOnError: true - script: echo Adding a final line From 66718b8cc5ccb421d7aacefba46b10657b006359 Mon Sep 17 00:00:00 2001 From: Noelle Caldwell Date: Tue, 12 May 2020 16:20:43 -0700 Subject: [PATCH 13/18] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bb67305..b3dec8e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -34,7 +34,6 @@ steps: languages: 'csharp' githubServiceConnection: 'noellelc' environment: development - nugetVersion: '0.1.1465-alpha' continueOnError: true - script: echo Adding a final line From 5e40f4c98eb6d1746804cc02f9331dd7abdd68d8 Mon Sep 17 00:00:00 2001 From: Noelle Caldwell Date: Tue, 12 May 2020 16:26:30 -0700 Subject: [PATCH 14/18] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b3dec8e..8e37393 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -34,6 +34,7 @@ steps: languages: 'csharp' githubServiceConnection: 'noellelc' environment: development + nugetVersion: '0.1.1382-alpha' continueOnError: true - script: echo Adding a final line From 964654f92993ea7fa3792f5103e6e26c2a4e6c68 Mon Sep 17 00:00:00 2001 From: Noelle Caldwell Date: Tue, 12 May 2020 16:29:28 -0700 Subject: [PATCH 15/18] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8e37393..0d2885b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,7 +10,7 @@ trigger: exclude: ["*.md"] queue: - name: Hosted Windows 2019 with VS2019 + name: Hosted VS2017 timeoutInMinutes: 60 steps: @@ -35,6 +35,5 @@ steps: githubServiceConnection: 'noellelc' environment: development nugetVersion: '0.1.1382-alpha' + isPrivateFeed: true continueOnError: true -- script: echo Adding a final line - From a5debfe2aa1f452b43228d97cd5d86bf21e46e86 Mon Sep 17 00:00:00 2001 From: Noelle Caldwell Date: Tue, 12 May 2020 16:31:48 -0700 Subject: [PATCH 16/18] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0d2885b..f35c1c4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -35,5 +35,6 @@ steps: githubServiceConnection: 'noellelc' environment: development nugetVersion: '0.1.1382-alpha' + nugetFeed: 'https://devdiv.pkgs.visualstudio.com/Personal/_packaging/richnav/nuget/v3/index.json' isPrivateFeed: true continueOnError: true From cd2cd05c1e5494e3062194aabacf8d2e527ed1dd Mon Sep 17 00:00:00 2001 From: Noelle Caldwell Date: Tue, 12 May 2020 16:40:10 -0700 Subject: [PATCH 17/18] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f35c1c4..e5d03ba 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -28,6 +28,11 @@ steps: inputs: command: build projects: "**/*.csproj" +- task: UseDotNet@2 + displayName: 'Switch back to 2.0 Use .NET Core sdk' + inputs: + packageType: sdk + version: 2.x - task: MS-RichCodeNav.Indexer.build-task.RichCodeNavIndexer@0 displayName: Rich Code Navigation Upload to Dev inputs: From 2a0f7ab045133135a2f6d82e54b702ee227997a8 Mon Sep 17 00:00:00 2001 From: noecald Date: Fri, 15 May 2020 15:59:21 -0700 Subject: [PATCH 18/18] added comment --- Program.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Program.cs b/Program.cs index 9245d5e..124e0f6 100644 --- a/Program.cs +++ b/Program.cs @@ -15,6 +15,8 @@ static void Main(string[] args) Console.WriteLine($"12 * 3 = {calc.Multiply(12,3)}"); Console.WriteLine($"12 / 3 = {calc.Divide(12,3)}"); Console.WriteLine($"12 ^ 3 = {calc.Power(12,3)}"); + + // comment } } }