Merge pull request #26 from Microsoft/users/jmarks/RemoveNetCore

Remove .netcore 2

Author: JimsonChalissery

ManagedClientConsoleAppSample/ManagedClientConsoleAppSample.csproj

@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>net452</TargetFrameworks>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <RootNamespace>ManagedClientConsoleAppSample</RootNamespace>
     <AssemblyName>ManagedClientConsoleAppSample</AssemblyName>

ManagedClientConsoleAppSample/Program.cs

@@ -23,14 +23,10 @@ public static void Main(string[] args)
             AuthenticationContext ctx = GetAuthenticationContext(null);
             AuthenticationResult result = null;
 
-            IPlatformParameters promptBehavior = new PlatformParameters();
-#if NET452
-            promptBehavior = new PlatformParameters(PromptBehavior.Always);
-#endif
+            IPlatformParameters promptBehavior = new PlatformParameters(PromptBehavior.Always);
 
             try
             {
-
                 //PromptBehavior.RefreshSession will enforce an authn prompt every time. NOTE: Auto will take your windows login state if possible
                 result = ctx.AcquireTokenAsync(azureDevOpsResourceId, clientId, new Uri(replyUri), promptBehavior).Result;
                 Console.WriteLine("Token expires on: " + result.ExpiresOn);

OAuthWebSample/.gitignore

@@ -164,3 +164,5 @@ $RECYCLE.BIN/
 storage*
 db.lock
 *.pubxml
+
+.vs/

OAuthWebSample/OAuthWebSample/Views/Home/Index.cshtml

@@ -1,18 +1,16 @@
 @{
-    ViewBag.Title = "Visual Studio Team Services OAuth Client Sample";
+    ViewBag.Title = "Azure DevOps OAuth Client Sample";
 
     var missingMsg = "Not set - update web.config";
     var clientAppIdVal = !String.IsNullOrEmpty(ViewBag.ClientAppId) ? ViewBag.ClientAppId : missingMsg;
     var scopeVal = !String.IsNullOrEmpty(ViewBag.Scope) ? ViewBag.Scope : missingMsg;
     var callbackUrlVal = !String.IsNullOrEmpty(ViewBag.CallbackUrl) ? ViewBag.CallbackUrl : missingMsg;
 }
 
-
-
 <div class="jumbotron">
-    <h1>Visual Studio Team Services OAuth Client Sample</h1>
-    <p class="lead">This app shows how to authorize a user to authorize an app and then to request an access token to access Visual Studio Team Services on their behalf.</p>
-    <p><a href="@Url.Action("Authorize", "OAuth")" class="btn btn-primary btn-large">Authorize &raquo;</a></p>
+    <h1>Azure DevOps OAuth Client Sample</h1>
+    <p class="lead">This app shows how to authorize a user to authorize an app and then to request an access token to access Azure DevOps on their behalf.</p>
+    <p><a href="/oauth/requesttoken" class="btn btn-primary btn-large"  >Authorize &raquo;</a></p>
 </div>
 
 <div class="row">
@@ -21,7 +19,7 @@
         <p>
             Before you start, make sure to:
             <ol>
-                <li><a href="https://app.vsaex.visualstudio.com/app/register">Register</a> a client app with Visual Studio Team Services</li>
+                <li><a href="https://app.vsaex.visualstudio.com/app/register">Register</a> a client app with Azure DevOps</li>
                 <li>Update the web.config of this web app and set the App ID, Scope, App Secret, and Callback URL set in the registered app. The callback URL should be https://<i>site</i>/oauth/callback
                     <ul>
                         <li>App ID: <strong>@clientAppIdVal</strong></li>
@@ -33,8 +31,8 @@
         </p>
     </div>
     <div class="col-md-4">
-        <h2>Learn about auth in Visual Studio Team Services</h2>
-        <p>Visual Studio Team Services support authorization via OAuth 2.0. Learn more about how you can develop apps that securely access your user's Visual Studio Team Services projects and perform tasks on their behalf.</p>
-        <p><a class="btn btn-default" href="https://docs.microsoft.com/vsts/integrate/get-started/authentication/oauth?view=vsts">Learn more &raquo;</a></p>
+        <h2>Learn about auth in Azure DevOps</h2>
+        <p>Azure DevOps supports authorization via OAuth 2.0. Learn more about how you can develop apps that securely access your user's Azure DevOps projects and perform tasks on their behalf.</p>
+        <p><a class="btn btn-default" href="https://docs.microsoft.com/en-us/vsts/integrate/get-started/authentication/oauth?view=vsts">Learn more &raquo;</a></p>
     </div>
 </div>

OAuthWebSample/README.md

@@ -4,6 +4,7 @@ This sample shows how to prompt a user to authorize a cloud service that can cal
 
 To learn more about OAuth in Azure DevOps, see [Authorize access to Azure DevOps with OAuth 2.0](https://docs.microsoft.com/en-us/azure/devops/integrate/get-started/authentication/oauth?view=vsts)
 
+
 ## How to setup
 
 > These instructions assume you will be deploying this sample app to an Azure web app. To learn more and to get started, visit [Get started with Azure Web Apps and ASP.NET](https://docs.microsoft.com/azure/app-service/app-service-web-get-started-dotnet-framework).
@@ -38,6 +39,7 @@ To learn more about OAuth in Azure DevOps, see [Authorize access to Azure DevOps
 
 If everything is setup properly, Azure DevOps will issue an access token and refresh token and both values will be displayed. **You should keep these values secret**. Also a new authorization will appear in [your profile page](https://app.vssps.visualstudio.com/Profile/View).
 
+
 With the access token you can invoke [Azure DevOps REST APIs](https://docs.microsoft.com/en-us/rest/api/vsts/?view=vsts-rest-4.1) by providing the access token in the Authorization header.
 
 ```