Skip to content
This repository has been archived by the owner on Aug 2, 2024. It is now read-only.

Commit

Permalink
Changed master to amin
Browse files Browse the repository at this point in the history
  • Loading branch information
Adrian Hall committed Jun 14, 2020
1 parent 19a7ab0 commit c2def10
Show file tree
Hide file tree
Showing 15 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
4 changes: 2 additions & 2 deletions docs/chapter1/firstapp_mac.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/
2 changes: 1 addition & 1 deletion docs/chapter1/firstapp_pc.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
4 changes: 2 additions & 2 deletions docs/chapter2/enterprise.md
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ you can [skip the Social Authentication section](debugging.md).
<!-- External Links -->
[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/

6 changes: 3 additions & 3 deletions docs/chapter2/realworld.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion docs/chapter2/social.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/chapter5/ios.md
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ Next you can move onto [Windows Push](./windows.md) or skip to the [Recipes Sect
<!-- Links -->
[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
Expand Down
2 changes: 1 addition & 1 deletion docs/chapter6/angular.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/
2 changes: 1 addition & 1 deletion docs/chapter6/jquery.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion docs/chapter6/react.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion docs/chapter7/search.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion docs/chapter8/testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion docs/chapter9/appsvc.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion docs/chapter9/arm.md
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ The Azure App Service is
},
"deploymentRepoBranch": {
"type": "string",
"defaultValue": "master"
"defaultValue": "main"
}
},
"variables": {
Expand Down
2 changes: 1 addition & 1 deletion docs/chapter9/monitoring.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit c2def10

Please sign in to comment.