Update everything else to .NET 7

.github/workflows/ci.yml

@@ -355,8 +355,8 @@ jobs:
       run: |
         ./src/ci/get-version.sh > src/deployment/VERSION
         cd src/ApiService/ApiService/
-        mv az-local.settings.json bin/Release/net6.0/local.settings.json
-        cd bin/Release/net6.0/
+        mv az-local.settings.json bin/Release/net*/local.settings.json
+        cd bin/Release/net*/
         zip -r api-service-net.zip .
         mkdir -p ${GITHUB_WORKSPACE}/artifacts/service-net
         cp api-service-net.zip ${GITHUB_WORKSPACE}/artifacts/service-net
@@ -563,7 +563,7 @@ jobs:
           cp -r libfuzzer-aarch64-crosscompile/fuzz.exe libfuzzer-aarch64-crosscompile/inputs artifacts/linux-libfuzzer-aarch64-crosscompile
 
           # C# target.
-          sudo apt-get install -y dotnet-sdk-6.0
+          sudo apt-get install -y dotnet-sdk-7.0
           (cd GoodBad; dotnet publish -c Release -o out)
           mv GoodBad/out artifacts/GoodBadDotnet
 

.github/workflows/codeql-analysis.yml

@@ -36,7 +36,7 @@ jobs:
         if: ${{ matrix.language == 'csharp' }}
         uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: "6.0.300"
+          dotnet-version: "7.0.0"
 
       - name: Install dependencies
         if: ${{ matrix.language == 'csharp' }}

src/ApiService/ApiService/ApiService.csproj

@@ -3,7 +3,7 @@
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
     <OutputType>Exe</OutputType>
     <WarningLevel>5</WarningLevel>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Azure.ResourceManager.Monitor" Version="1.0.0-beta.2" />

src/ApiService/ApiService/az-local.settings.json

@@ -2,6 +2,6 @@
     "IsEncrypted": false,
     "Values": {
       "FUNCTIONS_WORKER_RUNTIME": "dotnet-isolated",
-      "linux_fx_version": "DOTNET-ISOLATED|6.0"
+      "linux_fx_version": "DOTNET-ISOLATED|7.0"
     }
-}
+}

src/ApiService/ApiService/onefuzzlib/WebhookOperations.cs

@@ -1,5 +1,6 @@
 using System.Net.Http;
 using System.Security.Cryptography;
+using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
 using ApiService.OneFuzzLib.Orm;
@@ -106,10 +107,9 @@ public async Task<EventPing> Ping(Webhook webhook) {
         }
 
         string? digest = null;
-        var hmac = HMAC.Create("HMACSHA512");
-        if (secretToken != null && hmac != null) {
-            hmac.Key = System.Text.Encoding.UTF8.GetBytes(secretToken);
-            digest = Convert.ToHexString(hmac.ComputeHash(System.Text.Encoding.UTF8.GetBytes(data)));
+        if (secretToken is not null) {
+            using var hmac = new HMACSHA512(Encoding.UTF8.GetBytes(secretToken));
+            digest = Convert.ToHexString(hmac.ComputeHash(Encoding.UTF8.GetBytes(data)));
         }
         return new Tuple<string, string?>(data, digest);
 

src/ApiService/ApiService/packages.lock.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "dependencies": {
-    "net6.0": {
+    "net7.0": {
       "Azure.Core": {
         "type": "Direct",
         "requested": "[1.25.0, )",

src/ApiService/FunctionalTests/FunctionalTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 

src/ApiService/FunctionalTests/packages.lock.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "dependencies": {
-    "net6.0": {
+    "net7.0": {
       "coverlet.collector": {
         "type": "Direct",
         "requested": "[3.1.2, )",

src/agent/LibFuzzerDotnetLoader/LibFuzzerDotnetLoader.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <LangVersion>10.0</LangVersion>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

src/agent/LibFuzzerDotnetLoader/README.md

@@ -114,20 +114,20 @@ clang -g -O2 -fsanitize=fuzzer libfuzzer-dotnet-windows.cc -o libfuzzer-dotnet.e
 
 ### Build `LibFuzzerDotnetLoader`
 
-Next, using .NET 6, you need to [publish](https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-publish) a self-contained
+Next, using .NET 7, you need to [publish](https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-publish) a self-contained
 build of the loader.
 
 Note: this depends on SharpFuzz 2.0.0 or greater.
 
 #### Linux
 ```
-dotnet publish src/SharpFuzz.CommandLine -f net6.0 -c Release --sc -r linux-x64
+dotnet publish src/SharpFuzz.CommandLine -f net7.0 -c Release --sc -r linux-x64
 ```
 
 #### Windows 10
 ```
-dotnet publish src\SharpFuzz.CommandLine -f net6.0 -c Release --sc -r win10-x64
+dotnet publish src\SharpFuzz.CommandLine -f net7.0 -c Release --sc -r win10-x64
 ```
 
 In the end, you should have two binaries for your platform: `libfuzzer-dotnet`(`.exe`) and `LibFuzzerDotnetLoader`(.`exe`).
-Together with the `sharpfuzz` CLI tool for instrumentation assemblies, you are now ready to fuzz.
+Together with the `sharpfuzz` CLI tool for instrumentation assemblies, you are now ready to fuzz.

src/ci/dotnet-fuzzing-tools.ps1

@@ -20,7 +20,7 @@ mkdir $ARTIFACTS/sharpfuzz
 git clone $SHARPFUZZ_REPO sharpfuzz
 pushd sharpfuzz
 git checkout $SHARPFUZZ_COMMIT
-dotnet publish src/SharpFuzz.CommandLine -f net6.0 -c Release -o $ARTIFACTS/sharpfuzz --self-contained -r win10-x64
+dotnet publish src/SharpFuzz.CommandLine -f net7.0 -c Release -o $ARTIFACTS/sharpfuzz --self-contained -r win10-x64
 popd
 
 # Build SharpFuzz and our dynamic loader harness for `libfuzzer-dotnet`.

src/ci/dotnet-fuzzing-tools.sh

@@ -23,13 +23,13 @@ mkdir -p $ARTIFACTS/sharpfuzz
 sudo apt-get install -y llvm-10 llvm-10-dev clang-10
 
 # Install `SharpFuzz` and `LibFuzzerDotnetLoader` pre-reqs.
-sudo apt-get install -y dotnet-sdk-6.0
+sudo apt-get install -y dotnet-sdk-7.0
 
 # Build SharpFuzz instrumentor.
 git clone $SHARPFUZZ_REPO sharpfuzz
 pushd sharpfuzz
 git checkout $SHARPFUZZ_COMMIT
-dotnet publish src/SharpFuzz.CommandLine -f net6.0 -c Release -o $ARTIFACTS/sharpfuzz --self-contained -r linux-x64
+dotnet publish src/SharpFuzz.CommandLine -f net7.0 -c Release -o $ARTIFACTS/sharpfuzz --self-contained -r linux-x64
 popd
 
 # Build SharpFuzz and our dynamic loader harness for `libfuzzer-dotnet`.

src/deployment/azuredeploy.bicep

@@ -278,7 +278,7 @@ module pythonFunction 'bicep-templates/function.bicep' = {
 module netFunction 'bicep-templates/function.bicep' = {
   name: 'netFunction'
   params: {
-    linux_fx_version: 'DOTNET-ISOLATED|6.0'
+    linux_fx_version: 'DOTNET-ISOLATED|7.0'
     name: '${name}-net'
 
     app_logs_sas_url: storage.outputs.FuncSasUrlBlobAppLogs

src/deployment/bicep-templates/function.bicep

@@ -41,7 +41,7 @@ var commonSiteConfig = {
 }
 
 var extraProperties = (use_windows && enable_remote_debugging) ? {
-  netFrameworkVersion: 'v6.0'
+  netFrameworkVersion: 'v7.0'
   remoteDebuggingEnabled: true
   remoteDebuggingVersion: 'VS2022'
 } : {}

src/integration-tests/GoodBad/GoodBad.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <LangVersion>10.0</LangVersion>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

src/runtime-tools/linux/setup.sh

@@ -12,7 +12,7 @@ USER_SETUP="/onefuzz/setup/setup.sh"
 TASK_SETUP="/onefuzz/bin/task-setup.sh"
 MANAGED_SETUP="/onefuzz/bin/managed.sh"
 SCALESET_SETUP="/onefuzz/bin/scaleset-setup.sh"
-DOTNET_VERSION="6.0.300"
+DOTNET_VERSION="7.0.0"
 export DOTNET_ROOT=/onefuzz/tools/dotnet
 export DOTNET_CLI_HOME="$DOTNET_ROOT"
 export ONEFUZZ_ROOT=/onefuzz