Merge branch 'main' into patch-1

Author: ashmind

#scripts/roslyn-branches/arm/template.json

@@ -34,7 +34,7 @@
                 "serverFarmId": "[variables('serverfarms_main_id')]",
                 "clientAffinityEnabled": false,
                 "siteConfig": {
-                    "netFrameworkVersion": "v8.0",
+                    "netFrameworkVersion": "v9.0",
                     "publishingUsername": "[concat('$', parameters('sites_name'))]",
                     "use32BitWorkerProcess": true,
                     "webSocketsEnabled": true,

#scripts/roslyn-branches/flow/update/updateBranch.ts

@@ -177,7 +177,7 @@ async function buildSharpLab(roslynPackagesRoot: string) {
         // sigh: dotnet.exe should do this, but of course it does not
         const projectPath = projectPathUntyped as string;
         const projectName = path.basename(projectPath);
-        if (/mirrorsharp[^/\\]*[/\\]Internal\.Roslyn/i.test(projectPath)) {
+        if (/mirrorsharp[^/\\]*[/\\]Internal\.Roslyn|Mobius\.ILasm\.Tests\.SourceGenerator/i.test(projectPath)) {
             console.log(`  ${projectName}`);
             console.log('    Skipping');
             continue;
@@ -222,6 +222,7 @@ async function buildSharpLab(roslynPackagesRoot: string) {
         '--source', 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json',
         '--source', 'https://ci.appveyor.com/nuget/vanara-prerelease',
         '--source', roslynPackagesRoot,
+        '-p:NuGetAudit=false',
         '--verbosity', 'minimal'
     ], {
         stdout: 'inherit',
@@ -242,7 +243,7 @@ async function buildSharpLab(roslynPackagesRoot: string) {
     });
 
     return {
-        publishRoot: `${branchSourceRoot}/Server/bin/Release/net8.0/publish`
+        publishRoot: `${branchSourceRoot}/Server/bin/Release/net9.0/publish`
     };
 }
 

.github/workflows/container-host-edge.yml

@@ -14,19 +14,19 @@ on:
 
 jobs:
   build:
-    name: 'Build (.NET 8)'
+    name: 'Build (.NET 9)'
     # https://github.community/t/duplicate-checks-on-push-and-pull-request-simultaneous-event/18012/5
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
     runs-on: windows-latest
     env:
       NUGET_PACKAGES: ${{github.workspace}}/.nuget/packages
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'true'
-      - uses: actions/setup-dotnet@v3
+      - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
       - uses: microsoft/[email protected]
 
       # https://github.com/actions/setup-dotnet/issues/155
@@ -47,7 +47,7 @@ jobs:
       - run: dotnet build source/Tests --configuration Release
       - run: dotnet test source/Tests --no-build --configuration Release
       - run: dotnet publish source/Container.Manager --no-build --configuration Release
-      - run: Compress-Archive -Path 'source/Container.Manager/bin/Release/net8.0/publish/*' -DestinationPath 'Container.Manager.zip'
+      - run: Compress-Archive -Path 'source/Container.Manager/bin/Release/net9.0/publish/*' -DestinationPath 'Container.Manager.zip'
         shell: pwsh
 
       - uses: actions/upload-artifact@v3

.github/workflows/roslyn-branches.yml

@@ -51,9 +51,9 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: '20.14.0'
-      - uses: actions/setup-dotnet@v3
+      - uses: actions/setup-dotnet@v4
         with:
-            dotnet-version: 8.0.x
+            dotnet-version: 9.0.x
       - run: npm ci
       - run: npm run update-branch -- ${{matrix.branch}}
         env:

.github/workflows/server-edge.yml

@@ -16,19 +16,19 @@ on:
 
 jobs:
   build-core:
-    name: 'Build (.NET 8)'
+    name: 'Build (.NET 9)'
     # https://github.community/t/duplicate-checks-on-push-and-pull-request-simultaneous-event/18012/5
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
     runs-on: windows-latest
     env:
       NUGET_PACKAGES: ${{github.workspace}}/.nuget/packages
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'true'
-      - uses: actions/setup-dotnet@v3
+      - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
       - uses: microsoft/[email protected]
 
       # https://github.com/actions/setup-dotnet/issues/155
@@ -52,9 +52,9 @@ jobs:
       - run: dotnet test source/Tests --no-build --configuration Release
       - run: dotnet publish source/Server --no-build --configuration Release
       - run: dotnet publish source/WebApp.Server --no-build --configuration Release /p:ErrorOnDuplicatePublishOutputFiles=false
-      - run: Compress-Archive -Path 'source/Server/bin/Release/net8.0/publish/*' -DestinationPath 'Server.zip'
+      - run: Compress-Archive -Path 'source/Server/bin/Release/net9.0/publish/*' -DestinationPath 'Server.zip'
         shell: pwsh
-      - run: Compress-Archive -Path 'source/WebApp.Server/bin/Release/net8.0/publish/*' -DestinationPath 'WebApp.Server.zip'
+      - run: Compress-Archive -Path 'source/WebApp.Server/bin/Release/net9.0/publish/*' -DestinationPath 'WebApp.Server.zip'
         shell: pwsh
 
       - uses: actions/upload-artifact@v3
@@ -109,12 +109,12 @@ jobs:
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'true'
-      - uses: actions/setup-dotnet@v3
+      - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
 
       # https://github.com/actions/setup-dotnet/issues/155
       - run: dotnet nuget locals all --clear
@@ -178,7 +178,7 @@ jobs:
       - deploy-netfx
     if: github.ref == 'refs/heads/main'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - run: 'git show ${{ github.sha }} --format="version_number=%cd" --date=format:%Y-%m-%d-%H%M --no-patch >> $GITHUB_OUTPUT'
         id: version

global.json

@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "8.0.100",
+        "version": "9.0.100",
         "rollForward": "latestFeature"
     }
 }

source/#external/Mobius.ILasm

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AssemblyName>SharpLab.Container.Manager</AssemblyName>
     <RootNamespace>SharpLab.Container.Manager</RootNamespace>
   </PropertyGroup>
@@ -13,6 +13,8 @@
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.17.0" />
     <PackageReference Include="protobuf-net" Version="3.0.101" />
     <PackageReference Include="System.Runtime.Caching" Version="5.0.0" />
+    <!-- Avoids vulnerability in version referenced by other dependencies -->
+    <PackageReference Include="System.Drawing.Common" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>

source/#external/mirrorsharp-codemirror-6-preview

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AssemblyName>SharpLab.Container.Warmup</AssemblyName>
     <RootNamespace>SharpLab.Container.Warmup</RootNamespace>
   </PropertyGroup>