diff --git a/NuGet.config b/NuGet.config index a98f6210739743..990bce3fd7c992 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d141a5d00e0811..010bbfc6871e89 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,17 +8,17 @@ https://github.com/dotnet/msquic 98129287d56a5e0348c291ce4260e630b4aa510d - + https://github.com/dotnet/emsdk - 374833d8416df22155bc0509559352af65bd8266 + 07c7b3da3b4b9d810fa24e1a115918c4efa9e924 - + https://github.com/dotnet/emsdk - 374833d8416df22155bc0509559352af65bd8266 + 07c7b3da3b4b9d810fa24e1a115918c4efa9e924 - + https://github.com/dotnet/emsdk - 374833d8416df22155bc0509559352af65bd8266 + 07c7b3da3b4b9d810fa24e1a115918c4efa9e924 https://github.com/dotnet/wcf @@ -26,77 +26,77 @@ - + https://github.com/dotnet/arcade - bb1e72113a7eaf8bebda940beba8cf8bee1b453f + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - bb1e72113a7eaf8bebda940beba8cf8bee1b453f + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - bb1e72113a7eaf8bebda940beba8cf8bee1b453f + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - bb1e72113a7eaf8bebda940beba8cf8bee1b453f + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - bb1e72113a7eaf8bebda940beba8cf8bee1b453f + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - bb1e72113a7eaf8bebda940beba8cf8bee1b453f + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - bb1e72113a7eaf8bebda940beba8cf8bee1b453f + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - bb1e72113a7eaf8bebda940beba8cf8bee1b453f + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - bb1e72113a7eaf8bebda940beba8cf8bee1b453f + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - bb1e72113a7eaf8bebda940beba8cf8bee1b453f + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - bb1e72113a7eaf8bebda940beba8cf8bee1b453f + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - bb1e72113a7eaf8bebda940beba8cf8bee1b453f + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - bb1e72113a7eaf8bebda940beba8cf8bee1b453f + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - bb1e72113a7eaf8bebda940beba8cf8bee1b453f + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - bb1e72113a7eaf8bebda940beba8cf8bee1b453f + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - bb1e72113a7eaf8bebda940beba8cf8bee1b453f + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - bb1e72113a7eaf8bebda940beba8cf8bee1b453f + 0967701e5527a1be21d9473821077c3f4be7f9dc - + https://github.com/dotnet/arcade - bb1e72113a7eaf8bebda940beba8cf8bee1b453f + 0967701e5527a1be21d9473821077c3f4be7f9dc https://github.com/microsoft/vstest @@ -218,9 +218,9 @@ https://github.com/dotnet/xharness e9669dc84ecd668d3bbb748758103e23b394ffef - + https://github.com/dotnet/arcade - bb1e72113a7eaf8bebda940beba8cf8bee1b453f + 0967701e5527a1be21d9473821077c3f4be7f9dc https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 58a9494754ab3c..a47969e9382708 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,21 +41,21 @@ 1.1.0-preview.22164.17 - 6.0.0-beta.22512.3 - 6.0.0-beta.22512.3 - 6.0.0-beta.22512.3 - 6.0.0-beta.22512.3 - 6.0.0-beta.22512.3 - 6.0.0-beta.22512.3 - 2.5.1-beta.22512.3 - 6.0.0-beta.22512.3 - 6.0.0-beta.22512.3 - 6.0.0-beta.22512.3 - 6.0.0-beta.22512.3 - 6.0.0-beta.22512.3 - 6.0.0-beta.22512.3 - 6.0.0-beta.22512.3 - 6.0.0-beta.22512.3 + 6.0.0-beta.22561.1 + 6.0.0-beta.22561.1 + 6.0.0-beta.22561.1 + 6.0.0-beta.22561.1 + 6.0.0-beta.22561.1 + 6.0.0-beta.22561.1 + 2.5.1-beta.22561.1 + 6.0.0-beta.22561.1 + 6.0.0-beta.22561.1 + 6.0.0-beta.22561.1 + 6.0.0-beta.22561.1 + 6.0.0-beta.22561.1 + 6.0.0-beta.22561.1 + 6.0.0-beta.22561.1 + 6.0.0-beta.22561.1 6.0.0-preview.1.102 @@ -172,9 +172,9 @@ 11.1.0-alpha.1.21416.1 11.1.0-alpha.1.21416.1 - 6.0.11 - 6.0.11 - 6.0.11 + 6.0.12 + 6.0.12 + 6.0.12 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) 1.1.87-gba258badda diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index fdfeea66e7d43f..b09ea669f9c0aa 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -52,7 +52,7 @@ done # Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples cpuname=$(uname -m) case $cpuname in - aarch64) + arm64|aarch64) buildarch=arm64 ;; amd64|x86_64) @@ -61,7 +61,7 @@ case $cpuname in armv*l) buildarch=arm ;; - i686) + i[3-6]86) buildarch=x86 ;; *) diff --git a/eng/common/native/find-native-compiler.sh b/eng/common/native/find-native-compiler.sh index dd43d0f62dd5a1..aed19d07d506ff 100644 --- a/eng/common/native/find-native-compiler.sh +++ b/eng/common/native/find-native-compiler.sh @@ -55,7 +55,7 @@ if [ -z "$CLR_CC" ]; then # Set default versions if [ -z "$majorVersion" ]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [[ "$compiler" == "clang" ]]; then versions=( 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) + if [ "$compiler" = "clang" ]; then versions=( 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) elif [ "$compiler" = "gcc" ]; then versions=( 9 8 7 6 5 4.9 ); fi for version in "${versions[@]}"; do diff --git a/eng/common/sdl/sdl.ps1 b/eng/common/sdl/sdl.ps1 new file mode 100644 index 00000000000000..648c5068d7d60f --- /dev/null +++ b/eng/common/sdl/sdl.ps1 @@ -0,0 +1,38 @@ + +function Install-Gdn { + param( + [Parameter(Mandatory=$true)] + [string]$Path, + + # If omitted, install the latest version of Guardian, otherwise install that specific version. + [string]$Version + ) + + $ErrorActionPreference = 'Stop' + Set-StrictMode -Version 2.0 + $disableConfigureToolsetImport = $true + $global:LASTEXITCODE = 0 + + # `tools.ps1` checks $ci to perform some actions. Since the SDL + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true + . $PSScriptRoot\..\tools.ps1 + + $argumentList = @("install", "Microsoft.Guardian.Cli", "-Source https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json", "-OutputDirectory $Path", "-NonInteractive", "-NoCache") + + if ($Version) { + $argumentList += "-Version $Version" + } + + Start-Process nuget -Verbose -ArgumentList $argumentList -NoNewWindow -Wait + + $gdnCliPath = Get-ChildItem -Filter guardian.cmd -Recurse -Path $Path + + if (!$gdnCliPath) + { + Write-PipelineTelemetryError -Category 'Sdl' -Message 'Failure installing Guardian' + } + + return $gdnCliPath.FullName +} \ No newline at end of file diff --git a/eng/common/templates/steps/execute-sdl.yml b/eng/common/templates/steps/execute-sdl.yml index 7b8ee18a28d7e7..9dd5709f66dc71 100644 --- a/eng/common/templates/steps/execute-sdl.yml +++ b/eng/common/templates/steps/execute-sdl.yml @@ -8,29 +8,28 @@ parameters: condition: '' steps: -- ${{ if ne(parameters.overrideGuardianVersion, '') }}: - - powershell: | - $content = Get-Content $(GuardianPackagesConfigFile) - - Write-Host "packages.config content was:`n$content" - - $content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)') - $content | Set-Content $(GuardianPackagesConfigFile) - - Write-Host "packages.config content updated to:`n$content" - displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }} +- task: NuGetAuthenticate@1 + inputs: + nuGetServiceConnections: GuardianConnect - task: NuGetToolInstaller@1 displayName: 'Install NuGet.exe' -- task: NuGetCommand@2 - displayName: 'Install Guardian' - inputs: - restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config - feedsToUse: config - nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config - externalFeedCredentials: GuardianConnect - restoreDirectory: $(Build.SourcesDirectory)\.packages +- ${{ if ne(parameters.overrideGuardianVersion, '') }}: + - pwsh: | + Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + . .\sdl.ps1 + $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }} + Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" + displayName: Install Guardian (Overridden) + +- ${{ if eq(parameters.overrideGuardianVersion, '') }}: + - pwsh: | + Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + . .\sdl.ps1 + $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts + Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" + displayName: Install Guardian - ${{ if ne(parameters.overrideParameters, '') }}: - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} @@ -40,7 +39,7 @@ steps: - ${{ if eq(parameters.overrideParameters, '') }}: - powershell: ${{ parameters.executeAllSdlToolsScript }} - -GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion) + -GuardianCliLocation $(GuardianCliLocation) -NugetPackageDirectory $(Build.SourcesDirectory)\.packages -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) ${{ parameters.additionalParameters }} @@ -62,7 +61,28 @@ steps: c i condition: succeededOrFailed() + - publish: $(Agent.BuildDirectory)/.gdn artifact: GuardianConfiguration displayName: Publish GuardianConfiguration + condition: succeededOrFailed() + + # Publish the SARIF files in a container named CodeAnalysisLogs to enable integration + # with the "SARIF SAST Scans Tab" Azure DevOps extension + - task: CopyFiles@2 + displayName: Copy SARIF files + inputs: + flattenFolders: true + sourceFolder: $(Agent.BuildDirectory)/.gdn/rc/ + contents: '**/*.sarif' + targetFolder: $(Build.SourcesDirectory)/CodeAnalysisLogs + condition: succeededOrFailed() + + # Use PublishBuildArtifacts because the SARIF extension only checks this case + # see microsoft/sarif-azuredevops-extension#4 + - task: PublishBuildArtifacts@1 + displayName: Publish SARIF files to CodeAnalysisLogs container + inputs: + pathToPublish: $(Build.SourcesDirectory)/CodeAnalysisLogs + artifactName: CodeAnalysisLogs condition: succeededOrFailed() \ No newline at end of file diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index b5b3e5aeb3b915..abb1b2bcda42b8 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -63,11 +63,6 @@ steps: targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' fi - runtimeOsArgs= - if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then - runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' - fi - publishArgs= if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then publishArgs='--publish' @@ -80,7 +75,6 @@ steps: $internalRuntimeDownloadArgs \ $internalRestoreArgs \ $targetRidArgs \ - $runtimeOsArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true displayName: Build diff --git a/global.json b/global.json index 2949501f896e17..974e1d38abf3d4 100644 --- a/global.json +++ b/global.json @@ -1,21 +1,21 @@ { "sdk": { - "version": "6.0.110", + "version": "6.0.111", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.110" + "dotnet": "6.0.111" }, "native-tools": { "cmake": "3.16.4", "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.22512.3", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22512.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22512.3", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.22512.3", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.22561.1", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22561.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22561.1", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.22561.1", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6" diff --git a/src/tests/Common/wasm-test-runner/WasmTestRunner.proj b/src/tests/Common/wasm-test-runner/WasmTestRunner.proj index e2eda44d7ffc02..d5d3c46d7ea271 100644 --- a/src/tests/Common/wasm-test-runner/WasmTestRunner.proj +++ b/src/tests/Common/wasm-test-runner/WasmTestRunner.proj @@ -1,6 +1,8 @@ - - + + + $(TestBinDir)\obj\ + + false