From c7cab43bd1d7c30f10cdba6e92c73e9e4669fb10 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 19 Aug 2022 20:48:21 -0700 Subject: [release/7.0-rc1] Add a way to suppress all trimming warnings (#74220) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add a way to suppress all trimming warnings Fixes #73926. Also adding AOT analysis suppression for parity. I didn't port the warning level support because the compat kind of goes beyond that. We can revisit later if needed. * Update Microsoft.NETCore.Native.targets Co-authored-by: Michal Strehovský --- eng/testing/tests.singlefile.targets | 39 ++---------------------------------- 1 file changed, 2 insertions(+), 37 deletions(-) (limited to 'eng') diff --git a/eng/testing/tests.singlefile.targets b/eng/testing/tests.singlefile.targets index 86a8b98d545..d307e837e62 100644 --- a/eng/testing/tests.singlefile.targets +++ b/eng/testing/tests.singlefile.targets @@ -26,48 +26,13 @@ $(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll $(CoreCLRAotSdkDir) $(NetCoreAppCurrentTestHostSharedFrameworkPath) - $(NoWarn);IL3050;IL3051;IL3052;IL3054;IL3055;IL1005;IL3002 + $(NoWarn);IL1005;IL3002 partial - false true + true true - - - - $(NoWarn);IL2026;IL2116 - - $(NoWarn);IL2041;IL2042;IL2043;IL2056 - - $(NoWarn);IL2045 - - $(NoWarn);IL2046 - - $(NoWarn);IL2050 - - $(NoWarn);IL2032;IL2055;IL2057;IL2058;IL2059;IL2060;IL2061;IL2096 - - $(NoWarn);IL2062;IL2063;IL2064;IL2065;IL2066 - - $(NoWarn);IL2067;IL2068;IL2069;IL2070;IL2071;IL2072;IL2073;IL2074;IL2075;IL2076;IL2077;IL2078;IL2079;IL2080;IL2081;IL2082;IL2083;IL2084;IL2085;IL2086;IL2087;IL2088;IL2089;IL2090;IL2091 - - $(NoWarn);IL2092;IL2093;IL2094;IL2095 - - $(NoWarn);IL2097;IL2098;IL2099;IL2106 - - $(NoWarn);IL2103 - - $(NoWarn);IL2107;IL2117 - - $(NoWarn);IL2109 - - $(NoWarn);IL2110;IL2111;IL2114;IL2115 - - $(NoWarn);IL2112;IL2113 - - $(NoWarn);IL2118;IL2119;IL2120 - -- cgit v1.2.3 From 3c73d4d1122bfdbd48679ccc674eb9df18f5a062 Mon Sep 17 00:00:00 2001 From: Juan Hoyos Date: Sat, 20 Aug 2022 00:31:04 -0700 Subject: [release/7.0] Update arcade to 7.0.0-beta.22418.4 (#74210) --- eng/Version.Details.xml | 76 +++++++++++++++--------------- eng/Versions.props | 32 ++++++------- eng/common/sdl/sdl.ps1 | 37 +++++++++++++++ eng/common/templates/steps/execute-sdl.yml | 37 +++++++-------- 4 files changed, 108 insertions(+), 74 deletions(-) create mode 100644 eng/common/sdl/sdl.ps1 (limited to 'eng') diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 394b058cb4b..d0d017b9fe7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,77 +54,77 @@ - + https://github.com/dotnet/arcade - afc901d73d7d3bd363547ddf8769efe14052bfa7 + 0c027eede69ba22bafca9a1955f1e00848655ece - + https://github.com/dotnet/arcade - afc901d73d7d3bd363547ddf8769efe14052bfa7 + 0c027eede69ba22bafca9a1955f1e00848655ece - + https://github.com/dotnet/arcade - afc901d73d7d3bd363547ddf8769efe14052bfa7 + 0c027eede69ba22bafca9a1955f1e00848655ece - + https://github.com/dotnet/arcade - afc901d73d7d3bd363547ddf8769efe14052bfa7 + 0c027eede69ba22bafca9a1955f1e00848655ece - + https://github.com/dotnet/arcade - afc901d73d7d3bd363547ddf8769efe14052bfa7 + 0c027eede69ba22bafca9a1955f1e00848655ece - + https://github.com/dotnet/arcade - afc901d73d7d3bd363547ddf8769efe14052bfa7 + 0c027eede69ba22bafca9a1955f1e00848655ece - + https://github.com/dotnet/arcade - afc901d73d7d3bd363547ddf8769efe14052bfa7 + 0c027eede69ba22bafca9a1955f1e00848655ece - + https://github.com/dotnet/arcade - afc901d73d7d3bd363547ddf8769efe14052bfa7 + 0c027eede69ba22bafca9a1955f1e00848655ece - + https://github.com/dotnet/arcade - afc901d73d7d3bd363547ddf8769efe14052bfa7 + 0c027eede69ba22bafca9a1955f1e00848655ece - + https://github.com/dotnet/arcade - afc901d73d7d3bd363547ddf8769efe14052bfa7 + 0c027eede69ba22bafca9a1955f1e00848655ece - + https://github.com/dotnet/arcade - afc901d73d7d3bd363547ddf8769efe14052bfa7 + 0c027eede69ba22bafca9a1955f1e00848655ece - + https://github.com/dotnet/arcade - afc901d73d7d3bd363547ddf8769efe14052bfa7 + 0c027eede69ba22bafca9a1955f1e00848655ece - + https://github.com/dotnet/arcade - afc901d73d7d3bd363547ddf8769efe14052bfa7 + 0c027eede69ba22bafca9a1955f1e00848655ece - + https://github.com/dotnet/arcade - afc901d73d7d3bd363547ddf8769efe14052bfa7 + 0c027eede69ba22bafca9a1955f1e00848655ece - + https://github.com/dotnet/arcade - afc901d73d7d3bd363547ddf8769efe14052bfa7 + 0c027eede69ba22bafca9a1955f1e00848655ece - + https://github.com/dotnet/arcade - afc901d73d7d3bd363547ddf8769efe14052bfa7 + 0c027eede69ba22bafca9a1955f1e00848655ece - + https://github.com/dotnet/arcade - afc901d73d7d3bd363547ddf8769efe14052bfa7 + 0c027eede69ba22bafca9a1955f1e00848655ece - + https://github.com/dotnet/arcade - afc901d73d7d3bd363547ddf8769efe14052bfa7 + 0c027eede69ba22bafca9a1955f1e00848655ece https://github.com/dotnet/runtime-assets @@ -250,9 +250,9 @@ https://github.com/dotnet/xharness 5ebf69650b9f7b4ecab485be840b3022420f7812 - + https://github.com/dotnet/arcade - afc901d73d7d3bd363547ddf8769efe14052bfa7 + 0c027eede69ba22bafca9a1955f1e00848655ece https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 0a1d7ed3b2f..b0dcb312569 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,22 +54,22 @@ 7.0.100-rc.1.22402.1 - 7.0.0-beta.22416.1 - 7.0.0-beta.22416.1 - 7.0.0-beta.22416.1 - 7.0.0-beta.22416.1 - 7.0.0-beta.22416.1 - 7.0.0-beta.22416.1 - 2.5.1-beta.22416.1 - 7.0.0-beta.22416.1 - 7.0.0-beta.22416.1 - 7.0.0-beta.22416.1 - 7.0.0-beta.22416.1 - 7.0.0-beta.22416.1 - 7.0.0-beta.22416.1 - 7.0.0-beta.22416.1 - 7.0.0-beta.22416.1 - 7.0.0-beta.22416.1 + 7.0.0-beta.22418.4 + 7.0.0-beta.22418.4 + 7.0.0-beta.22418.4 + 7.0.0-beta.22418.4 + 7.0.0-beta.22418.4 + 7.0.0-beta.22418.4 + 2.5.1-beta.22418.4 + 7.0.0-beta.22418.4 + 7.0.0-beta.22418.4 + 7.0.0-beta.22418.4 + 7.0.0-beta.22418.4 + 7.0.0-beta.22418.4 + 7.0.0-beta.22418.4 + 7.0.0-beta.22418.4 + 7.0.0-beta.22418.4 + 7.0.0-beta.22418.4 6.0.0-preview.1.102 diff --git a/eng/common/sdl/sdl.ps1 b/eng/common/sdl/sdl.ps1 new file mode 100644 index 00000000000..ac196e164a4 --- /dev/null +++ b/eng/common/sdl/sdl.ps1 @@ -0,0 +1,37 @@ + +function Install-Gdn { + param( + [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 73245593cef..86cf578c431 100644 --- a/eng/common/templates/steps/execute-sdl.yml +++ b/eng/common/templates/steps/execute-sdl.yml @@ -8,29 +8,26 @@ 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: | + . $(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: | + . $(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 +37,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 }} -- cgit v1.2.3