From c2def10062cc94469317a525f934c0c01e4211f5 Mon Sep 17 00:00:00 2001 From: Adrian Hall Date: Sun, 14 Jun 2020 12:58:22 -0700 Subject: [PATCH] Changed master to amin --- README.md | 2 +- docs/chapter1/firstapp_mac.md | 4 ++-- docs/chapter1/firstapp_pc.md | 2 +- docs/chapter2/enterprise.md | 4 ++-- docs/chapter2/realworld.md | 6 +++--- docs/chapter2/social.md | 2 +- docs/chapter5/ios.md | 2 +- docs/chapter6/angular.md | 2 +- docs/chapter6/jquery.md | 2 +- docs/chapter6/react.md | 2 +- docs/chapter7/search.md | 2 +- docs/chapter8/testing.md | 2 +- docs/chapter9/appsvc.md | 2 +- docs/chapter9/arm.md | 2 +- docs/chapter9/monitoring.md | 2 +- 15 files changed, 19 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index a397a785..0471bdbc 100644 --- a/README.md +++ b/README.md @@ -26,4 +26,4 @@ To serve the static site locally, use: mkdocs serve ``` -The site will be on http://localhost:8000. The main site is automatically built when I merge changes into the master branch on GitLab. +The site will be on http://localhost:8000. The main site is automatically built when I merge changes into the main branch on GitHub. \ No newline at end of file diff --git a/docs/chapter1/firstapp_mac.md b/docs/chapter1/firstapp_mac.md index 155fc68a..6525c883 100644 --- a/docs/chapter1/firstapp_mac.md +++ b/docs/chapter1/firstapp_mac.md @@ -1282,9 +1282,9 @@ The following 7 chapters each take one aspect of the cloud services that can be [6]: https://portal.azure.com/ [7]: https://guidgenerator.com/ [8]: https://developer.xamarin.com/guides/xamarin-forms/creating-mobile-apps-xamarin-forms/ -[9]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/blob/master/Chapter1 +[9]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/blob/main/Chapter1 [10]: https://jfarrell.net/2015/02/07/platform-specific-styling-with-xamarin-forms/ [11]: https://developer.apple.com/ [12]: https://developer.apple.com/library/ios/documentation/IDEs/Conceptual/AppDistributionGuide/MaintainingCertificates/MaintainingCertificates.html#//apple_ref/doc/uid/TP40012582-CH31-SW6 -[13]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/blob/master/Chapter1/Backend/Web.config +[13]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/blob/main/Chapter1/Backend/Web.config [vsmac]: https://www.visualstudio.com/vs/visual-studio-mac/ diff --git a/docs/chapter1/firstapp_pc.md b/docs/chapter1/firstapp_pc.md index 439fccbb..81ff9647 100644 --- a/docs/chapter1/firstapp_pc.md +++ b/docs/chapter1/firstapp_pc.md @@ -1225,7 +1225,7 @@ The following 7 chapters each take one aspect of the cloud services that can be [8]: https://visualstudiogallery.msdn.microsoft.com/e1d736b0-5531-4eee-a27a-30a0318cac45 [9]: https://developer.xamarin.com/guides/ios/getting_started/installation/windows/connecting-to-mac/ [10]: https://developer.xamarin.com/guides/xamarin-forms/creating-mobile-apps-xamarin-forms/ -[11]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/blob/master/Chapter1 +[11]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/blob/main/Chapter1 [12]: https://github.com/ [13]: https://stackoverflow.com/questions/3480201/how-do-you-install-an-apk-file-in-the-android-emulator/3480235#3480235 [14]: https://jfarrell.net/2015/02/07/platform-specific-styling-with-xamarin-forms/ diff --git a/docs/chapter2/enterprise.md b/docs/chapter2/enterprise.md index d95ff134..85e31b3f 100644 --- a/docs/chapter2/enterprise.md +++ b/docs/chapter2/enterprise.md @@ -607,7 +607,7 @@ you can [skip the Social Authentication section](debugging.md). [classic-portal]: https://manage.windowsazure.com/ [portal]: https://portal.azure.com/ -[1]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/blob/master/Chapter2/TaskList/TaskList/Helpers/ServiceLocator.cs -[10]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/tree/master/Chapter2 +[1]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/blob/main/Chapter2/TaskList/TaskList/Helpers/ServiceLocator.cs +[10]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/tree/main/Chapter2 [22]: https://developer.xamarin.com/guides/xamarin-forms/dependency-service/ diff --git a/docs/chapter2/realworld.md b/docs/chapter2/realworld.md index 04a83570..a8802e9b 100644 --- a/docs/chapter2/realworld.md +++ b/docs/chapter2/realworld.md @@ -727,6 +727,6 @@ I've also added a logout button to my `Pages\TaskList.xaml` ([view code][36]) an [portal]: https://portal.azure.com/ [classic-portal]: https://manage.windowsazure.com/ [34]: http://stackoverflow.com/questions/25044166/how-to-clone-a-httprequestmessage-when-the-original-request-has-content -[35]: https://github.com/Azure/azure-mobile-apps-net-client/blob/master/src/Microsoft.WindowsAzure.MobileServices/MobileServiceClient.cs -[36]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/blob/master/Chapter2/TaskList/TaskList/Pages/TaskList.xaml#L12 -[37]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/blob/master/Chapter2/TaskList/TaskList/ViewModels/TaskListViewModel.cs#L112 +[35]: https://github.com/Azure/azure-mobile-apps-net-client/blob/main/src/Microsoft.WindowsAzure.MobileServices/MobileServiceClient.cs +[36]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/blob/main/Chapter2/TaskList/TaskList/Pages/TaskList.xaml#L12 +[37]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/blob/main/Chapter2/TaskList/TaskList/ViewModels/TaskListViewModel.cs#L112 diff --git a/docs/chapter2/social.md b/docs/chapter2/social.md index d6fdd52a..d76489b1 100644 --- a/docs/chapter2/social.md +++ b/docs/chapter2/social.md @@ -596,7 +596,7 @@ There are a number of pre-built Xamarin libraries for handling provider authenti [portal]: https://portal.azure.com/ [8]: https://facebook.com/ [9]: https://developers.facebook.com/ -[10]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/tree/master/Chapter2 +[10]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/tree/main/Chapter2 [11]: https://accounts.google.com/ [12]: https://console.developers.google.com/iam-admin/projects [13]: https://apps.dev.microsoft.com/?mkt=en-us#/appList diff --git a/docs/chapter5/ios.md b/docs/chapter5/ios.md index 1301a50b..358d3512 100644 --- a/docs/chapter5/ios.md +++ b/docs/chapter5/ios.md @@ -344,7 +344,7 @@ Next you can move onto [Windows Push](./windows.md) or skip to the [Recipes Sect [Azure portal]: https;//portal.azure.com/ [NodeJS]: https://nodejs.org/en/download/ -[tools]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/tree/master/tools +[tools]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/tree/main/tools [1]: http://developer.apple.com/account [2]: https://developer.apple.com/library/content/documentation/IDEs/Conceptual/AppDistributionGuide/MaintainingProfiles/MaintainingProfiles.html#//apple_ref/doc/uid/TP40012582-CH30-SW991 [3]: https://developer.apple.com/library/content/documentation/IDEs/Conceptual/AppDistributionGuide/MaintainingProfiles/MaintainingProfiles.html diff --git a/docs/chapter6/angular.md b/docs/chapter6/angular.md index ccf58ee4..8521bd92 100644 --- a/docs/chapter6/angular.md +++ b/docs/chapter6/angular.md @@ -297,5 +297,5 @@ When using authentication this way, it is vital that you have a singleton model [4]: https://vslive.com/Blogs/News-and-Tips/2016/02/4-Must-Read-Angular-Blogs.aspx [5]: https://github.com/tastejs/todomvc/tree/gh-pages/examples/angularjs [6]: http://todomvc.com/ -[7]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/tree/master/Chapter6 +[7]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/tree/main/Chapter6 [8]: https://nodejs.org/en/ diff --git a/docs/chapter6/jquery.md b/docs/chapter6/jquery.md index e0e2a549..9882867f 100644 --- a/docs/chapter6/jquery.md +++ b/docs/chapter6/jquery.md @@ -281,6 +281,6 @@ We insert data by passing the object to insert to `table.insert()`, modify with [2]: https://facebook.github.io/react/ [3]: https://angularjs.org/ [4]: https://www.npmjs.com/package/azure-mobile-apps-client -[5]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/blob/master/Chapter6/Backend/Content/spa/jquery/application.css +[5]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/blob/main/Chapter6/Backend/Content/spa/jquery/application.css [6]: https://en.wikipedia.org/wiki/Immediately-invoked_function_expression [7]: https://msdn.microsoft.com/en-us/library/azure/jj613353.aspx \ No newline at end of file diff --git a/docs/chapter6/react.md b/docs/chapter6/react.md index 3ba14f0f..df9086fa 100644 --- a/docs/chapter6/react.md +++ b/docs/chapter6/react.md @@ -402,4 +402,4 @@ There is a lot more to be said about the capabilities of React, Redux, BabelJS a [16]: https://babeljs.io/docs/plugins/transform-class-properties/ [17]: https://babeljs.io/docs/plugins/transform-object-rest-spread/ [18]: https://github.com/madskristensen/NpmTaskRunner -[19]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/tree/master/Chapter6/Backend +[19]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/tree/main/Chapter6/Backend diff --git a/docs/chapter7/search.md b/docs/chapter7/search.md index 98da66c1..9c29fa49 100644 --- a/docs/chapter7/search.md +++ b/docs/chapter7/search.md @@ -560,4 +560,4 @@ concerns. [6]: http://api.androidhive.info/json/movies.json [7]: https://docs.microsoft.com/en-us/rest/api/searchservice/odata-expression-syntax-for-azure-search [8]: https://docs.microsoft.com/en-us/rest/api/searchservice/lucene-query-syntax-in-azure-search -[9]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/tree/master/Chapter7 +[9]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/tree/main/Chapter7 diff --git a/docs/chapter8/testing.md b/docs/chapter8/testing.md index 35273ede..20ab81b0 100644 --- a/docs/chapter8/testing.md +++ b/docs/chapter8/testing.md @@ -831,7 +831,7 @@ Your beta testers will now get an email telling them there is a new app availabl [4]: https://en.wikipedia.org/wiki/Test-driven_development [5]: https://github.com/dariusz-wozniak/List-of-Testing-Tools-and-Frameworks-for-.NET/blob/master/README.md [6]: https://docs.microsoft.com/en-us/visualstudio/test/walkthrough-creating-and-running-unit-tests-for-managed-code -[7]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/tree/master/Chapter8 +[7]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/tree/main/Chapter8 [8]: ../chapter1/firstapp_pc.md [9]: https://developer.apple.com/library/content/documentation/IDEs/Conceptual/AppDistributionGuide/MaintainingProfiles/MaintainingProfiles.html#//apple_ref/doc/uid/TP40012582-CH30-SW10 [10]: https://developer.xamarin.com/guides/testcloud/testrecorder/ diff --git a/docs/chapter9/appsvc.md b/docs/chapter9/appsvc.md index bd3167a5..ea8045ba 100644 --- a/docs/chapter9/appsvc.md +++ b/docs/chapter9/appsvc.md @@ -78,7 +78,7 @@ I also recommend linking a Continuous Deployment stream to the staging slot, rat The service will download the latest source code from the specified branch, build the server and deploy it. You can check the status of the deployment through **Deployment options** on the staging slot as well. -As a best practice, create a new branch (I call my branch "azure") and deploy that branch. When you wish to update the deployed server, merge from the master branch to the azure branch and then push to the remote repository. This will then be picked up by your App Service and the new service will be deployed. +As a best practice, create a new branch (I call my branch "azure") and deploy that branch. When you wish to update the deployed server, merge from the main branch to the azure branch and then push to the remote repository. This will then be picked up by your App Service and the new service will be deployed. By combining continuous deployment with slots, you can have control over the deployment to staging and control the production deployment easily. This is a powerful "DevOps" combination of features. diff --git a/docs/chapter9/arm.md b/docs/chapter9/arm.md index 8c24d8d1..894b8c6c 100644 --- a/docs/chapter9/arm.md +++ b/docs/chapter9/arm.md @@ -302,7 +302,7 @@ The Azure App Service is }, "deploymentRepoBranch": { "type": "string", - "defaultValue": "master" + "defaultValue": "main" } }, "variables": { diff --git a/docs/chapter9/monitoring.md b/docs/chapter9/monitoring.md index bf95637b..a7aafaf6 100644 --- a/docs/chapter9/monitoring.md +++ b/docs/chapter9/monitoring.md @@ -216,4 +216,4 @@ Now go and make awesome mobile apps! [4]: https://docs.microsoft.com/en-us/azure/application-insights/app-insights-api-custom-events-metrics [5]: https://docs.microsoft.com/en-us/azure/application-insights/app-insights-api-filtering-sampling [6]: https://docs.microsoft.com/en-us/azure/application-insights/app-insights-scom -[7]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/tree/master/Chapter8/Backend +[7]: https://github.com/adrianhall/develop-mobile-apps-with-csharp-and-azure/tree/main/Chapter8/Backend