Merge branch 'main' into patch-1

ashmind · Nov 18, 2024 · 91ef711 · 91ef711
2 parents 2e18aa0 + a8902c9
commit 91ef711
Show file tree

Hide file tree

Showing 29 changed files with 219 additions and 192 deletions.
diff --git a/#scripts/roslyn-branches/arm/template.json b/#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,

diff --git a/#scripts/roslyn-branches/flow/update/updateBranch.ts b/#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`
     };
 }
 

diff --git a/.github/workflows/container-host-edge.yml b/.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/setup-msbuild@v1.1
 
       # 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

diff --git a/.github/workflows/roslyn-branches.yml b/.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:

diff --git a/.github/workflows/server-edge.yml b/.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/setup-msbuild@v1.1
 
       # 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

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "8.0.100",
+        "version": "9.0.100",
         "rollForward": "latestFeature"
     }
 }
diff --git a/source/#external/Mobius.ILasm b/source/#external/Mobius.ILasm
diff --git a/source/#external/mirrorsharp-codemirror-6-preview b/source/#external/mirrorsharp-codemirror-6-preview
diff --git a/source/Container.Manager/Container.Manager.csproj b/source/Container.Manager/Container.Manager.csproj
@@ -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>

diff --git a/source/Container.Warmup/Container.Warmup.csproj b/source/Container.Warmup/Container.Warmup.csproj
@@ -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>

diff --git a/source/Container/Container.csproj b/source/Container/Container.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AssemblyName>SharpLab.Container</AssemblyName>
     <RootNamespace>SharpLab.Container</RootNamespace>
     <OutputType>Exe</OutputType>

diff --git a/source/NetFramework/Server/Server.csproj b/source/NetFramework/Server/Server.csproj
@@ -20,7 +20,7 @@
     <PackageReference Include="Autofac" Version="4.9.2" />
     <PackageReference Include="Autofac.Extras.FileSystemRegistration" Version="1.0.0-pre-03" />
     <PackageReference Include="Autofac.Owin" Version="4.2.0" />
-    <PackageReference Include="Azure.Identity" Version="1.11.0" />
+    <PackageReference Include="Azure.Identity" Version="1.13.1" />
     <PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.1.0" />
     <PackageReference Include="ICSharpCode.Decompiler" Version="7.1.0.6543" />
     <PackageReference Include="JetBrains.Annotations" Version="10.4.0" />
@@ -41,6 +41,7 @@
     <PackageReference Include="SharpYaml" Version="1.6.2" />
     <PackageReference Include="System.Memory" Version="4.5.5" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
+    <PackageReference Include="System.Text.Json" Version="9.0.0" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
     <PackageReference Include="Unbreakable" Version="0.22.0-unproven" />
     <PackageReference Include="Unbreakable.Policy" Version="20.0.0" />

diff --git a/source/NetFramework/Server/Web.config b/source/NetFramework/Server/Web.config
@@ -87,7 +87,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Collections.Immutable" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -102,6 +102,12 @@
         <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.Cryptography.ProtectedData" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+    </assemblyBinding>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Tasks.Extensions" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
@@ -111,7 +117,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -165,7 +171,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Text.Json" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.3" newVersion="7.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -177,13 +183,13 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Text.Encodings.Web" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Azure.Core" culture="neutral" publicKeyToken="92742159e12e44c8" />
-        <bindingRedirect oldVersion="0.0.0.0-1.38.0.0" newVersion="1.38.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.44.1.0" newVersion="1.44.1.0" />
       </dependentAssembly>
     </assemblyBinding>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -192,5 +198,17 @@
         <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
     </assemblyBinding>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory.Data" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.AccessControl" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/source/Server/Server.csproj b/source/Server/Server.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <AssemblyName>SharpLab.Server</AssemblyName>
     <RootNamespace>SharpLab.Server</RootNamespace>
@@ -31,26 +31,35 @@
     <PackageReference Include="Autofac" Version="4.9.2" />
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="5.0.0" />
     <PackageReference Include="Autofac.Extras.FileSystemRegistration" Version="1.0.0-pre-03" />
-    <PackageReference Include="Azure.Identity" Version="1.11.0" />
+    <PackageReference Include="Azure.Identity" Version="1.13.1" />
     <PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.1.0" />
     <PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
     <PackageReference Include="ICSharpCode.Decompiler" Version="7.1.0.6543" />
     <PackageReference Include="JetBrains.Annotations" Version="10.4.0" />
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.17.0" />
     <PackageReference Include="Microsoft.Azure.Cosmos.Table" Version="1.0.8" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.8.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.8.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="4.8.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.8.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.12.0-3.final" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-3.final" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="4.12.0-3.final" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.12.0-3.final" />
     <PackageReference Include="Microsoft.Diagnostics.Runtime" Version="3.1.512801" />
     <PackageReference Include="Microsoft.ILVerification" Version="7.0.0-preview.4.22229.4" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.2.0" />
     <PackageReference Include="Mono.Cecil" Version="0.11.4" />
+    <!--
+      Avoids vulnerability in version referenced by other dependencies
+      TOOD: Try removing after upgrading Microsoft.Azure.Cosmos.Table.
+    -->
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Octokit" Version="0.32.0" />
     <PackageReference Include="Iced" Version="1.6.0" />
     <PackageReference Include="SharpYaml" Version="1.6.2" />
+    <PackageReference Include="System.Drawing.Common" Version="9.0.0" />
+    <PackageReference Include="System.Formats.Nrbf" Version="9.0.0" />
     <PackageReference Include="System.Memory" Version="4.5.5" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
+    <!-- Avoids vulnerability in version referenced by other dependencies -->
+    <PackageReference Include="System.Text.Json" Version="9.0.0" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
   </ItemGroup>