Merge branch 'main' into patch-5

Author: anandmeg

.github/workflows/clean-repo.yml

@@ -14,7 +14,7 @@ jobs:
       pull-requests: write
 
     steps:
-      - uses: actions/[email protected].5
+      - uses: actions/[email protected].7
 
       # Call clean repo
       - name: Clean repo

.github/workflows/whats-new.yml

@@ -18,7 +18,7 @@ jobs:
       pull-requests: write
 
     steps:
-      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
 
       - name: "Print manual run reason"
         if: ${{ github.event_name == 'workflow_dispatch' }}

.openpublishing.redirection.json

@@ -14,6 +14,11 @@
             "source_path": "subscriptions/azure-ea-devtest.md",
             "redirect_url": "/azure/devtest/offer/quickstart-create-enterprise-devtest-subscriptions",
             "redirect_document_id": false
+        },
+        {
+            "source_path": "subscriptions/microsoft-dev-box.md",
+            "redirect_url": "/visualstudio/subscriptions",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.subscriptions.json

@@ -0,0 +1,45 @@
+schedules:
+- cron: "0 18 * * 1-5" # Hour 18 UTC == 10am PST
+  displayName: "Scheduled run at 10 AM PT M-F"
+  branches:
+    include:
+    - main
+  always: false # This mean the pipeline runs even if there are no changes since the last successful run.
+
+- cron: "0 1 * * 1-5"  # Hour 1 UTC == 4pm PST
+  displayName: "Afternoon run at 4 PM PT M-F"
+  branches:
+    include:
+    - main
+  always: false # This mean the pipeline runs even if there are no changes since the last successful run.
+
+- cron: "0 6 * * 1-5"  # Hour 29 UTC == 4pm PST
+  displayName: "Afternoon run at 10 PM PT M-F"
+  branches:
+    include:
+    - main
+  always: false # This mean the pipeline runs even if there are no changes since the last successful run.
+trigger:
+- none
+
+jobs:
+- job: MergeMainToLive
+  pool:
+    vmImage: 'ubuntu-latest'
+  steps:
+  - checkout: self
+    persistCredentials: true
+  - script: |
+      git config --global user.name "Mike Jacobs"
+      git config --global user.email "[email protected]"
+      git checkout main
+      git checkout live
+      git merge main --no-ff --no-commit
+      if [ $? -eq 0 ]; then
+        git commit -m "Merged main into live"
+        git push origin live
+      else
+        echo "Error merging main to live"
+        exit 1
+      fi
+    displayName: 'Merge main to live if main has changed'

auto-publish.yaml

@@ -165,12 +165,18 @@ In this section, you set a breakpoint in your service.
 
 If you need to change how Bridge to Kubernetes connects to your cluster, in this section, you'll edit the launch profile settings.
 
-1. Click on the arrow next to the **Bridge to Kubernetes** button, then click on **databaseApi Debug Properties**.
+1. In the Visual Studio command bar, click on the arrow next to the start button (green triangle or "play" icon) to open the dropdown, then click on **databaseApi Debug Properties**.
  ![Screenshot shows the Bridge to Kubernetes drop down menu.](media/bridge-to-kubernetes-vs/change-bridge-properties.png)
 
 1. Click on the **Edit profile for Bridge to Kubernetes** link in the **Launch Profiles** dialog.
  ![Screenshot shows Launch Profiles dialog with a link to edit the Bridge to Kubernetes profile](media/bridge-to-kubernetes-vs/bridge-launch-profiles.png)
 
+Another way to get to this screen:
+
+1. Right-click on the project node in Solution Explorer, and choose **Properties** (or press **Alt**+**Enter**).
+
+1. Scroll down to **Debug**, and choose **Open debug launch profiles UI**.
+
 ## Clean up resources
 
 If you used the sample todo app for this tutorial, you can remove it from your cluster by using the Azure portal.

bridge/articles/bridge-to-kubernetes-vs.md

@@ -1,6 +1,6 @@
 ---
 title: "Configure Bridge to Kubernetes"
-ms.date: 08/11/2022
+ms.date: 04/26/2024
 ms.topic: "conceptual"
 description: Configure Bridge to Kubernetes to ignore port mapping on a Kubernetes service or replicate environment variables and mounted files for pods in a cluster.
 keywords: "Bridge to Kubernetes, Azure Dev Spaces, Dev Spaces, Docker, Kubernetes, Azure, containers"
@@ -16,6 +16,16 @@ You can configure the local Bridge to Kubernetes process using two methods. You
 
 ## Kubernetes configuration
 
+The Kubernetes configuration (kubeconfig) file is default stored at `~/.kube/config`, but you can set it by using the KUBECONFIG environment variable.
+
+If you're using Visual Studio, you can edit Bridge to Kubernetes launch profile in the IDE by using the **Debug launch profiles UI** in the Debug properties. See [Edit launch profile](./bridge-to-kubernetes-vs.md#edit-launch-profile).
+
+![Screenshot showing the Debug launch profiles UI.](./media/bridge-to-kubernetes-vs/edit-profile-for-bridge-to-kubernetes.png)
+
+From there, you can open the following screen, which provides a way to edit some of the most common configuration properties.
+
+![Screenshot showing editing some of the most common Bridge to Kubernetes profile properties.](./media/bridge-to-kubernetes-vs/edit-profile-for-bridge-to-kubernetes-screen.png)
+
 ### Prevent Bridge to Kubernetes from forwarding specific ports
 
 Configure Bridge to Kubernetes to ignore mapping specific ports on a Kubernetes service to your machine by adding the `bridgetokubernetes/ignore-ports` annotation on the service.

bridge/articles/configure-bridge-to-kubernetes.md

@@ -6,7 +6,7 @@ author: ghogen
 ms.author: ghogen
 ms.service: vs-code
 ms.topic: tutorial 
-ms.date: 04/12/2023
+ms.date: 05/30/2024
 # Agreed with Docker Inc. to provide this content. Contact is: nebuk89. Mike Morton has context on MSFT side, but has moved on to another role. 
 ---
 
@@ -148,15 +148,12 @@ A Dockerfile is a text-based script of instructions that is used to create a con
 
    The tag is a friendly name for the image.
 
-   To create a container image from the command line, use the following command.
+   To create a container image from the command line, use the following command from the `app` folder that has the *Dockerfile*.
 
     ```bash
     docker build -t getting-started .
     ```
 
-    > [!NOTE]
-    > In an external Bash window, go to the `app` folder that has the *Dockerfile* to run this command.
-
 You've used the *Dockerfile* to build a new container image.
 You might have noticed that many "layers" were downloaded.
 The *Dockerfile* starts from the `node:20-alpine` image.

bridge/articles/media/bridge-to-kubernetes-vs/edit-profile-for-bridge-to-kubernetes-screen.png

@@ -30,7 +30,7 @@ A type that is specifically marked as visible to Component Object Model (COM) co
 
 ## Rule description
 
-COM does not support `static` methods.
+COM doesn't support `static` methods.
 
 This rule ignores property and event accessors, operator overloading methods, or methods that are marked by using either the <xref:System.Runtime.InteropServices.ComRegisterFunctionAttribute?displayProperty=fullName> attribute or the <xref:System.Runtime.InteropServices.ComUnregisterFunctionAttribute?displayProperty=fullName> attribute.
 
@@ -61,7 +61,7 @@ To fix a violation of this rule, change the design to use an instance method tha
 
 ## When to suppress warnings
 
-It is safe to suppress a warning from this rule if a COM client does not require access to the functionality that is provided by the `static` method.
+It's safe to suppress a warning from this rule if a COM client doesn't require access to the functionality that is provided by the `static` method.
 
 ## Example Violation
 
@@ -75,15 +75,15 @@ The following example shows a `static` method that violates this rule.
 
 ### Comments
 
-In this example, the **Book.FromPages** method cannot be called from COM.
+In this example, the **Book.FromPages** method can't be called from COM.
 
 ## Example Fix
 
 ### Description
 
-To fix the violation in the previous example, you could change the method to an instance method, but that does not make sense in this instance. A better solution is to explicitly apply `ComVisible(false)` to the method to make it clear to other developers that the method cannot be seen from COM.
+To fix the violation in the previous example, you could change the method to an instance method, but that does not make sense in this instance. A better solution is to explicitly apply `ComVisible(false)` to the method to make it clear to other developers that the method can't be seen from COM.
 
-The following example applies <xref:System.Runtime.InteropServices.ComRegisterFunctionAttribute> to the method.
+The following example applies <xref:System.Runtime.InteropServices.ComVisibleAttribute> to the method.
 
 ### Code
 

bridge/articles/media/bridge-to-kubernetes-vs/edit-profile-for-bridge-to-kubernetes.png

@@ -3,7 +3,7 @@ title: Visual Studio Container Tools build properties
 author: ghogen
 description: Learn how to edit the Container Tools build properties to customize how Visual Studio builds and runs a container project.
 ms.author: ghogen
-ms.date: 06/06/2019
+ms.date: 05/21/2024
 ms.subservice: container-tools
 ms.topic: reference
 ---
@@ -70,8 +70,10 @@ The following project file shows examples of some of these settings.
  <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <UserSecretsId>feae72bf-2368-4487-b6c6-546c19338cb1</UserSecretsId>
+    <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <UserSecretsId>8c7ab9a5-d578-4c40-8b6d-54d174002229</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <!-- In CI/CD scenarios, you might need to change the context. By default, Visual Studio uses the
          folder above the Dockerfile. The path is relative to the Dockerfile, so here the context is
@@ -84,7 +86,7 @@ The following project file shows examples of some of these settings.
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.6" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
   </ItemGroup>
 
 </Project>