Merge pull request #238 from microsoft/main

Staging - 7/10/24
microsoft · Jul 10, 2024 · a85b55d · a85b55d
2 parents 24c51c7 + 2d0083a
commit a85b55d
Show file tree

Hide file tree

Showing 9 changed files with 1,549 additions and 1,545 deletions.
diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
@@ -20,7 +20,7 @@ parameters:
     - release
 
 variables:
-  MSIXVersion: '0.1000'
+  MSIXVersion: '0.1100'
   solution: '**/DevHomeAzureExtension.sln'
   appxPackageDir: 'AppxPackages'
   testOutputArtifactDir: 'TestResults'

diff --git a/build/scripts/CreateBuildInfo.ps1 b/build/scripts/CreateBuildInfo.ps1
@@ -5,7 +5,7 @@ Param(
 )
 
 $Major = "0"
-$Minor = "10"
+$Minor = "11"
 $Patch = "99" # default to 99 for local builds
 
 $versionSplit = $Version.Split(".");

diff --git a/src/AzureExtension/Assets/DevBoxProvider.png b/src/AzureExtension/Assets/DevBoxProvider.png
diff --git a/...Extension/Assets/QuickStartPlayground/Samples/csharp-hello-world/.devcontainer/Dockerfile b/...Extension/Assets/QuickStartPlayground/Samples/csharp-hello-world/.devcontainer/Dockerfile
@@ -3,5 +3,4 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0
 
 ENV DEBIAN_FRONTEND noninteractive
 
-RUN apt-get update && \
-apt-get install -y git
+RUN apt-get update && apt-get upgrade -y
diff --git a/...reExtension/Assets/QuickStartPlayground/Samples/rust-linked-list/.devcontainer/Dockerfile b/...reExtension/Assets/QuickStartPlayground/Samples/rust-linked-list/.devcontainer/Dockerfile
@@ -3,5 +3,5 @@ FROM mcr.microsoft.com/devcontainers/base:ubuntu
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt update && \
-apt install -y curl && build-essentials \
+apt install -y curl && build-essential \
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y