From 87bf1dfbac147b736e517b2e8743bbdde133cc80 Mon Sep 17 00:00:00 2001 From: Sarah Dutkiewicz Date: Wed, 1 Dec 2021 08:16:49 -0500 Subject: [PATCH] Updating git branch references from master to main --- Hands-on lab/Before the HOL - Serverless architecture.md | 2 +- Hands-on lab/Manual-resource-setup.md | 2 +- Hands-on lab/lab-files/arm-template/azure-deploy.json | 2 +- Hands-on lab/lab-files/arm-template/configure-labvm.ps1 | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Hands-on lab/Before the HOL - Serverless architecture.md b/Hands-on lab/Before the HOL - Serverless architecture.md index b9620de..9b615f9 100644 --- a/Hands-on lab/Before the HOL - Serverless architecture.md +++ b/Hands-on lab/Before the HOL - Serverless architecture.md @@ -104,7 +104,7 @@ In this task, you run an Azure Resource Manager (ARM) template to create the han 1. You are now ready to begin the ARM template deployment. To open a custom deployment screen in the Azure portal, select the Deploy to Azure button below: - [![Deploy to azure](media/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2FMCW-Serverless-architecture%2Fmaster%2FHands-on%20lab%2Flab-files%2Farm-template%2Fazure-deploy.json) + [![Deploy to azure](media/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2FMCW-Serverless-architecture%2Fmain%2FHands-on%20lab%2Flab-files%2Farm-template%2Fazure-deploy.json) 2. On the custom deployment screen, the first parameter you need to populate is the `ObjectId` associated with the account you used to log into the Azure portal. To retrieve this, select the **Cloud Shell** icon on the Azure portal toolbar to open an Azure Command Line Interface (CLI) terminal window at the bottom of your open browser window. diff --git a/Hands-on lab/Manual-resource-setup.md b/Hands-on lab/Manual-resource-setup.md index f2eebc8..3df98bd 100644 --- a/Hands-on lab/Manual-resource-setup.md +++ b/Hands-on lab/Manual-resource-setup.md @@ -673,7 +673,7 @@ In this task, you configure the LabVM with the required software and downloads. 2. Run the downloaded installer and follow the setup instruction. -3. Next, [download a copy of the Serverless Architecture MCW GitHub repo](https://github.com/microsoft/MCW-Serverless-architecture/archive/master.zip). +3. Next, [download a copy of the Serverless Architecture MCW GitHub repo](https://github.com/microsoft/MCW-Serverless-architecture/archive/main.zip). 4. Extract the download ZIP file to `C:\ServerlessMCW`. diff --git a/Hands-on lab/lab-files/arm-template/azure-deploy.json b/Hands-on lab/lab-files/arm-template/azure-deploy.json index d451771..4fe581e 100644 --- a/Hands-on lab/lab-files/arm-template/azure-deploy.json +++ b/Hands-on lab/lab-files/arm-template/azure-deploy.json @@ -49,7 +49,7 @@ "vmNetworkInterfaceName": "[concat(variables('vmName'), '-nic')]", "vmPublicIpAddressName": "[concat(variables('vmName'), '-ip')]", "vmCustomScriptFileName": "configure-labvm.ps1", - "vmCustomScriptUri": "[concat('https://raw.githubusercontent.com/microsoft/MCW-Serverless-architecture/master/Hands-on%20lab/lab-files/arm-template/', variables('vmCustomScriptFileName'))]", + "vmCustomScriptUri": "[concat('https://raw.githubusercontent.com/microsoft/MCW-Serverless-architecture/main/Hands-on%20lab/lab-files/arm-template/', variables('vmCustomScriptFileName'))]", "tollBoothFunctionAppName": "[concat('TollBoothFunctions-', uniqueString(resourceGroup().id))]", "tollBoothFunctionsHostingPlanName": "[concat('tollbooth-asp-', uniqueString(resourceGroup().id))]", diff --git a/Hands-on lab/lab-files/arm-template/configure-labvm.ps1 b/Hands-on lab/lab-files/arm-template/configure-labvm.ps1 index 8e0882c..acda119 100644 --- a/Hands-on lab/lab-files/arm-template/configure-labvm.ps1 +++ b/Hands-on lab/lab-files/arm-template/configure-labvm.ps1 @@ -15,10 +15,10 @@ function Disable-InternetExplorerESC { Disable-InternetExplorerESC # Download and extract the starter solution files -Invoke-WebRequest 'https://github.com/microsoft/MCW-Serverless-architecture/archive/master.zip' -OutFile 'C:\MCW.zip' +Invoke-WebRequest 'https://github.com/microsoft/MCW-Serverless-architecture/archive/main.zip' -OutFile 'C:\MCW.zip' Expand-Archive -LiteralPath 'C:\MCW.zip' -DestinationPath 'C:\ServerlessMCW' -Force -# Download and istall Microsoft Edge +# Download and install Microsoft Edge Invoke-WebRequest 'https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/0a4291f0-226e-4d0a-a702-7aa901f20ff4/MicrosoftEdgeEnterpriseX64.msi' -OutFile 'C:\MicrosoftEdgeEnterpriseX64.msi' $msiArgs = @( "/i"