ExternalVendorCode/onefuzz
1
0
Fork 0
mirror of https://github.com/microsoft/onefuzz.git synced 2025-06-18 20:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to .NET 7 (#2615)

Browse Source 
Update service code to .NET 7.0.

Also update the version installed onto agent nodes via setup scripts to 7.0.100.
This commit is contained in:
George Pollard
2022-11-18 10:39:45 +13:00
committed by GitHub
parent 1f46388e6d
commit 894dcc62be
22 changed files with 130 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.devcontainer/Dockerfile
View File

@ -7,12 +7,19 @@ FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}
# note: keep this in sync with .github/workflows/ci.yml
ARG RUSTVERSION="1.64"
# Needed for dotnet7; remove when available in Ubuntu
RUN wget https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
&& sudo dpkg -i packages-microsoft-prod.deb \
&& rm packages-microsoft-prod.deb
# Install packages required for build:
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y install --no-install-recommends \
libunwind-dev clang build-essential libssl-dev pkg-config lldb \
bash-completion npm dotnet6 \
python-is-python3 direnv uuid-runtime python3-distutils python3-pip python3-venv
bash-completion npm \
python-is-python3 direnv uuid-runtime python3-distutils python3-pip python3-venv \
dotnet-sdk-7.0
# TODO replace with dotnet7 when available in Ubuntu
# Install Rust:
USER vscode

22
.github/workflows/ci.yml vendored
View File

@ -20,6 +20,7 @@ env:
SCCACHE_CACHE_SIZE: 1G
ACTIONS_CACHE_KEY_DATE: 2022-10-28-01
CI: true
DOTNET_VERSION: 7.0.x
jobs:
agent:
@ -304,9 +305,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v2
uses: actions/setup-dotnet@v3
with:
dotnet-version: '6.0.300'
dotnet-version: ${{env.DOTNET_VERSION}}
dotnet-quality: 'ga'
- name: Install dependencies
run: |
cd src/ApiService/
@ -355,8 +357,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/net7.0/local.settings.json
cd bin/Release/net7.0/
zip -r api-service-net.zip .
mkdir -p ${GITHUB_WORKSPACE}/artifacts/service-net
cp api-service-net.zip ${GITHUB_WORKSPACE}/artifacts/service-net
@ -387,6 +389,11 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v3
with:
dotnet-version: ${{env.DOTNET_VERSION}}
dotnet-quality: 'ga'
- run: src/ci/dotnet-fuzzing-tools.sh
shell: bash
- uses: actions/upload-artifact@v3
@ -397,6 +404,11 @@ jobs:
runs-on: windows-2022
steps:
- uses: actions/checkout@v3
- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v3
with:
dotnet-version: ${{env.DOTNET_VERSION}}
dotnet-quality: 'ga'
- run: src/ci/dotnet-fuzzing-tools.ps1
shell: pwsh
- uses: actions/upload-artifact@v3
@ -563,7 +575,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

3
.github/workflows/codeql-analysis.yml vendored
View File

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

2
src/ApiService/ApiService/ApiService.csproj
View File

@ -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" />

2
src/ApiService/ApiService/az-local.settings.json
View File

@ -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"
}
}

8
src/ApiService/ApiService/onefuzzlib/WebhookOperations.cs
View File

@ -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 class WebhookOperations : Orm<Webhook>, IWebhookOperations {
}
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);

2
src/ApiService/ApiService/packages.lock.json
View File

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

4
src/ApiService/Directory.Build.props
View File

@ -2,7 +2,7 @@
<PropertyGroup>
<!-- set overall target framework -->
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<!-- build in Invariant mode: https://github.com/dotnet/runtime/blob/main/docs/design/features/globalization-invariant-mode.md -->
<!--
@ -19,7 +19,7 @@
<!-- enable code analysis -->
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<AnalysisLevel>6.0-Recommended</AnalysisLevel>
<AnalysisLevel>7.0-Recommended</AnalysisLevel>
<!-- check nullable types -->
<Nullable>enable</Nullable>

2
src/ApiService/FunctionalTests/FunctionalTests.csproj
View File

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

2
src/ApiService/FunctionalTests/packages.lock.json
View File

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

72
src/ApiService/IntegrationTests/packages.lock.json
View File

@ -1,7 +1,7 @@
{
"version": 1,
"dependencies": {
"net6.0": {
"net7.0": {
"coverlet.collector": {
"type": "Direct",
"requested": "[3.1.2, )",
@ -2405,41 +2405,41 @@
"apiservice": {
"type": "Project",
"dependencies": {
"Azure.Core": "1.25.0",
"Azure.Data.Tables": "12.5.0",
"Azure.Identity": "1.6.0",
"Azure.Messaging.EventGrid": "4.10.0",
"Azure.ResourceManager": "1.3.1",
"Azure.ResourceManager.Compute": "1.0.0-beta.8",
"Azure.ResourceManager.Monitor": "1.0.0-beta.2",
"Azure.ResourceManager.Network": "1.0.0",
"Azure.ResourceManager.Resources": "1.3.0",
"Azure.ResourceManager.Storage": "1.0.0-beta.11",
"Azure.Security.KeyVault.Secrets": "4.3.0",
"Azure.Storage.Blobs": "12.13.0",
"Azure.Storage.Queues": "12.11.0",
"Faithlife.Utility": "0.12.2",
"Microsoft.Azure.Functions.Worker": "1.10.0",
"Microsoft.Azure.Functions.Worker.ApplicationInsights": "1.0.0-preview3",
"Microsoft.Azure.Functions.Worker.Extensions.EventGrid": "2.1.0",
"Microsoft.Azure.Functions.Worker.Extensions.Http": "3.0.13",
"Microsoft.Azure.Functions.Worker.Extensions.SignalRService": "1.7.0",
"Microsoft.Azure.Functions.Worker.Extensions.Storage": "5.0.0",
"Microsoft.Azure.Functions.Worker.Extensions.Timer": "4.1.0",
"Microsoft.Azure.Functions.Worker.Sdk": "1.7.0",
"Microsoft.Azure.Management.Monitor": "0.28.0-preview",
"Microsoft.Azure.Management.OperationalInsights": "0.24.0-preview",
"Microsoft.Graph": "4.37.0",
"Microsoft.Identity.Client": "4.46.2",
"Microsoft.Identity.Web.TokenCache": "1.23.1",
"Microsoft.TeamFoundationServer.Client": "19.209.0-preview",
"Octokit": "2.0.1",
"Scriban": "5.5.0",
"Semver": "2.1.0",
"SmartAnalyzers.CSharpExtensions.Annotations": "4.2.7",
"System.IdentityModel.Tokens.Jwt": "6.22.1",
"System.Linq.Async": "6.0.1",
"TaskTupleAwaiter": "2.0.0"
"Azure.Core": "[1.25.0, )",
"Azure.Data.Tables": "[12.5.0, )",
"Azure.Identity": "[1.6.0, )",
"Azure.Messaging.EventGrid": "[4.10.0, )",
"Azure.ResourceManager": "[1.3.1, )",
"Azure.ResourceManager.Compute": "[1.0.0-beta.8, )",
"Azure.ResourceManager.Monitor": "[1.0.0-beta.2, )",
"Azure.ResourceManager.Network": "[1.0.0, )",
"Azure.ResourceManager.Resources": "[1.3.0, )",
"Azure.ResourceManager.Storage": "[1.0.0-beta.11, )",
"Azure.Security.KeyVault.Secrets": "[4.3.0, )",
"Azure.Storage.Blobs": "[12.13.0, )",
"Azure.Storage.Queues": "[12.11.0, )",
"Faithlife.Utility": "[0.12.2, )",
"Microsoft.Azure.Functions.Worker": "[1.10.0, )",
"Microsoft.Azure.Functions.Worker.ApplicationInsights": "[1.0.0-preview3, )",
"Microsoft.Azure.Functions.Worker.Extensions.EventGrid": "[2.1.0, )",
"Microsoft.Azure.Functions.Worker.Extensions.Http": "[3.0.13, )",
"Microsoft.Azure.Functions.Worker.Extensions.SignalRService": "[1.7.0, )",
"Microsoft.Azure.Functions.Worker.Extensions.Storage": "[5.0.0, )",
"Microsoft.Azure.Functions.Worker.Extensions.Timer": "[4.1.0, )",
"Microsoft.Azure.Functions.Worker.Sdk": "[1.7.0, )",
"Microsoft.Azure.Management.Monitor": "[0.28.0-preview, )",
"Microsoft.Azure.Management.OperationalInsights": "[0.24.0-preview, )",
"Microsoft.Graph": "[4.37.0, )",
"Microsoft.Identity.Client": "[4.46.2, )",
"Microsoft.Identity.Web.TokenCache": "[1.23.1, )",
"Microsoft.TeamFoundationServer.Client": "[19.209.0-preview, )",
"Octokit": "[2.0.1, )",
"Scriban": "[5.5.0, )",
"Semver": "[2.1.0, )",
"SmartAnalyzers.CSharpExtensions.Annotations": "[4.2.7, )",
"System.IdentityModel.Tokens.Jwt": "[6.22.1, )",
"System.Linq.Async": "[6.0.1, )",
"TaskTupleAwaiter": "[2.0.0, )"
}
}
}

72
src/ApiService/Tests/packages.lock.json
View File

@ -1,7 +1,7 @@
{
"version": 1,
"dependencies": {
"net6.0": {
"net7.0": {
"coverlet.collector": {
"type": "Direct",
"requested": "[3.1.2, )",
@ -2532,41 +2532,41 @@
"apiservice": {
"type": "Project",
"dependencies": {
"Azure.Core": "1.25.0",
"Azure.Data.Tables": "12.5.0",
"Azure.Identity": "1.6.0",
"Azure.Messaging.EventGrid": "4.10.0",
"Azure.ResourceManager": "1.3.1",
"Azure.ResourceManager.Compute": "1.0.0-beta.8",
"Azure.ResourceManager.Monitor": "1.0.0-beta.2",
"Azure.ResourceManager.Network": "1.0.0",
"Azure.ResourceManager.Resources": "1.3.0",
"Azure.ResourceManager.Storage": "1.0.0-beta.11",
"Azure.Security.KeyVault.Secrets": "4.3.0",
"Azure.Storage.Blobs": "12.13.0",
"Azure.Storage.Queues": "12.11.0",
"Faithlife.Utility": "0.12.2",
"Microsoft.Azure.Functions.Worker": "1.10.0",
"Microsoft.Azure.Functions.Worker.ApplicationInsights": "1.0.0-preview3",
"Microsoft.Azure.Functions.Worker.Extensions.EventGrid": "2.1.0",
"Microsoft.Azure.Functions.Worker.Extensions.Http": "3.0.13",
"Microsoft.Azure.Functions.Worker.Extensions.SignalRService": "1.7.0",
"Microsoft.Azure.Functions.Worker.Extensions.Storage": "5.0.0",
"Microsoft.Azure.Functions.Worker.Extensions.Timer": "4.1.0",
"Microsoft.Azure.Functions.Worker.Sdk": "1.7.0",
"Microsoft.Azure.Management.Monitor": "0.28.0-preview",
"Microsoft.Azure.Management.OperationalInsights": "0.24.0-preview",
"Microsoft.Graph": "4.37.0",
"Microsoft.Identity.Client": "4.46.2",
"Microsoft.Identity.Web.TokenCache": "1.23.1",
"Microsoft.TeamFoundationServer.Client": "19.209.0-preview",
"Octokit": "2.0.1",
"Scriban": "5.5.0",
"Semver": "2.1.0",
"SmartAnalyzers.CSharpExtensions.Annotations": "4.2.7",
"System.IdentityModel.Tokens.Jwt": "6.22.1",
"System.Linq.Async": "6.0.1",
"TaskTupleAwaiter": "2.0.0"
"Azure.Core": "[1.25.0, )",
"Azure.Data.Tables": "[12.5.0, )",
"Azure.Identity": "[1.6.0, )",
"Azure.Messaging.EventGrid": "[4.10.0, )",
"Azure.ResourceManager": "[1.3.1, )",
"Azure.ResourceManager.Compute": "[1.0.0-beta.8, )",
"Azure.ResourceManager.Monitor": "[1.0.0-beta.2, )",
"Azure.ResourceManager.Network": "[1.0.0, )",
"Azure.ResourceManager.Resources": "[1.3.0, )",
"Azure.ResourceManager.Storage": "[1.0.0-beta.11, )",
"Azure.Security.KeyVault.Secrets": "[4.3.0, )",
"Azure.Storage.Blobs": "[12.13.0, )",
"Azure.Storage.Queues": "[12.11.0, )",
"Faithlife.Utility": "[0.12.2, )",
"Microsoft.Azure.Functions.Worker": "[1.10.0, )",
"Microsoft.Azure.Functions.Worker.ApplicationInsights": "[1.0.0-preview3, )",
"Microsoft.Azure.Functions.Worker.Extensions.EventGrid": "[2.1.0, )",
"Microsoft.Azure.Functions.Worker.Extensions.Http": "[3.0.13, )",
"Microsoft.Azure.Functions.Worker.Extensions.SignalRService": "[1.7.0, )",
"Microsoft.Azure.Functions.Worker.Extensions.Storage": "[5.0.0, )",
"Microsoft.Azure.Functions.Worker.Extensions.Timer": "[4.1.0, )",
"Microsoft.Azure.Functions.Worker.Sdk": "[1.7.0, )",
"Microsoft.Azure.Management.Monitor": "[0.28.0-preview, )",
"Microsoft.Azure.Management.OperationalInsights": "[0.24.0-preview, )",
"Microsoft.Graph": "[4.37.0, )",
"Microsoft.Identity.Client": "[4.46.2, )",
"Microsoft.Identity.Web.TokenCache": "[1.23.1, )",
"Microsoft.TeamFoundationServer.Client": "[19.209.0-preview, )",
"Octokit": "[2.0.1, )",
"Scriban": "[5.5.0, )",
"Semver": "[2.1.0, )",
"SmartAnalyzers.CSharpExtensions.Annotations": "[4.2.7, )",
"System.IdentityModel.Tokens.Jwt": "[6.22.1, )",
"System.Linq.Async": "[6.0.1, )",
"TaskTupleAwaiter": "[2.0.0, )"
}
}
}

4
src/agent/LibFuzzerDotnetLoader/LibFuzzerDotnetLoader.csproj
View File

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

4
src/ci/dotnet-fuzzing-tools.ps1
View File

@ -20,12 +20,15 @@ mkdir $ARTIFACTS/sharpfuzz
git clone $SHARPFUZZ_REPO sharpfuzz
pushd sharpfuzz
git checkout $SHARPFUZZ_COMMIT
# TODO(dotnet): Update dotnet framework to 7.0 when SharpFuzz supports it
dotnet publish src/SharpFuzz.CommandLine -f net6.0 -c Release -o $ARTIFACTS/sharpfuzz --self-contained -r win10-x64
if ($LASTEXITCODE -ne 0) { throw "dotnet publish exited with $LASTEXITCODE" }
popd
# Build SharpFuzz and our dynamic loader harness for `libfuzzer-dotnet`.
pushd src/agent/LibFuzzerDotnetLoader
dotnet publish . -c Release -o $ARTIFACTS/LibFuzzerDotnetLoader --sc -r win10-x64
if ($LASTEXITCODE -ne 0) { throw "dotnet publish exited with $LASTEXITCODE" }
popd
# Build `libfuzzer-dotnet`.
@ -33,6 +36,7 @@ git clone $LIBFUZZER_DOTNET_REPO
pushd libfuzzer-dotnet
git checkout $LIBFUZZER_DOTNET_COMMIT
clang -g -O2 -fsanitize=fuzzer libfuzzer-dotnet-windows.cc -o libfuzzer-dotnet.exe
if ($LASTEXITCODE -ne 0) { throw "clang exited with $LASTEXITCODE" }
cp libfuzzer-dotnet.exe $ARTIFACTS/libfuzzer-dotnet
cp libfuzzer-dotnet.pdb $ARTIFACTS/libfuzzer-dotnet
popd

5
src/ci/dotnet-fuzzing-tools.sh
View File

@ -22,13 +22,14 @@ mkdir -p $ARTIFACTS/sharpfuzz
# Install `libfuzzer-dotnet` pre-reqs.
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
# Note that dotnet pre-reqs are presumed to be installed
# by the ci.yml setup (`setup-dotnet` action).
# Build SharpFuzz instrumentor.
git clone $SHARPFUZZ_REPO sharpfuzz
pushd sharpfuzz
git checkout $SHARPFUZZ_COMMIT
#TODO(dotnet): Update SharpFuzz to dotnet 7 when it is supported
dotnet publish src/SharpFuzz.CommandLine -f net6.0 -c Release -o $ARTIFACTS/sharpfuzz --self-contained -r linux-x64
popd

2
src/deployment/azuredeploy.bicep
View File

@ -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

2
src/deployment/bicep-templates/function.bicep
View File

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

2
src/deployment/deploy.py
View File

@ -1161,6 +1161,8 @@ class Client:
"publish",
self.application_name + DOTNET_APPLICATION_SUFFIX,
"--no-build",
"--dotnet-version",
"7.0",
],
env=dict(os.environ, CLI_DEBUG="1"),
cwd=tmpdirname,

4
src/integration-tests/GoodBad/GoodBad.csproj
View File

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

2
src/runtime-tools/linux/setup.sh
View File

@ -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.100"
export DOTNET_ROOT=/onefuzz/tools/dotnet
export DOTNET_CLI_HOME="$DOTNET_ROOT"
export ONEFUZZ_ROOT=/onefuzz

2
src/runtime-tools/win64/onefuzz.ps1
View File

@ -6,7 +6,7 @@ $env:ONEFUZZ_ROOT = "C:\onefuzz"
$env:ONEFUZZ_TOOLS = "C:\onefuzz\tools"
$env:LLVM_SYMBOLIZER_PATH = "llvm-symbolizer"
$env:RUST_LOG = "info"
$env:DOTNET_VERSION = "6.0.300"
$env:DOTNET_VERSION = "7.0.100"
# Set a session and machine scoped env var
$env:DOTNET_ROOT = "c:\onefuzz\tools\dotnet"
[Environment]::SetEnvironmentVariable("DOTNET_ROOT", $env:DOTNET_ROOT, "Machine")