Skip to content

[automated] Merge branch 'release/7.0-rc1' => 'release/7.0'#74205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ViktorHofer merged 8 commits into from
Aug 20, 2022
Merged

[automated] Merge branch 'release/7.0-rc1' => 'release/7.0' #74205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f908dbc
[Ppc64le] bug fixes (#74131)
alhad-deshpande Aug 19, 2022
195178b
Improve ControlledExecution tests (#74186)
github-actions[bot] Aug 19, 2022
1af9cfd
Shorten the workload name even more (#74176)
github-actions[bot] Aug 19, 2022
d9c1700
[release/7.0-rc1] Disable Int128 use in by value ABI scenarios, and f…
github-actions[bot] Aug 20, 2022
39d767a
Don't NativeAOT crossgen on ARM64 (#74221)
github-actions[bot] Aug 20, 2022
c7cab43
[release/7.0-rc1] Add a way to suppress all trimming warnings (#74220)
github-actions[bot] Aug 20, 2022
37193fd
Don't track current field of state machines (#74216)
github-actions[bot] Aug 20, 2022
3c73d4d
[release/7.0] Update arcade to 7.0.0-beta.22418.4 (#74210)
hoyosjs Aug 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 38 additions & 38 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,77 +54,77 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22416.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22418.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22416.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22418.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22416.1">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22418.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22416.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22418.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22416.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22418.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22416.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22418.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22416.1">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22418.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22416.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22418.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22416.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22418.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22416.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22418.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22416.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22418.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22416.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22418.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22416.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22418.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22416.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22418.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22416.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22418.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22416.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22418.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22416.1">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22418.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22416.1">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22418.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22409.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -250,9 +250,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>5ebf69650b9f7b4ecab485be840b3022420f7812</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22416.1">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22418.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,22 +54,22 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22416.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22416.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22416.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22416.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22416.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22416.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22416.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22416.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22416.1</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22418.4</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22418.4</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22418.4</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22418.4</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22418.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22418.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22418.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22418.4</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22418.4</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
37 changes: 37 additions & 0 deletions eng/common/sdl/sdl.ps1
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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
}
37 changes: 17 additions & 20 deletions eng/common/templates/steps/execute-sdl.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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 }}
Expand All@@ -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 }}
Expand Down
39 changes: 2 additions & 37 deletions eng/testing/tests.singlefile.targets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,48 +26,13 @@
<IlcBuildTasksPath>$(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
<IlcSdkPath>$(CoreCLRAotSdkDir)</IlcSdkPath>
<IlcFrameworkPath>$(NetCoreAppCurrentTestHostSharedFrameworkPath)</IlcFrameworkPath>
<NoWarn>$(NoWarn);IL3050;IL3051;IL3052;IL3054;IL3055;IL1005;IL3002</NoWarn>
<NoWarn>$(NoWarn);IL1005;IL3002</NoWarn>
<TrimMode>partial</TrimMode>
<TrimmerSingleWarn>false</TrimmerSingleWarn>
<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
<SuppressAotAnalysisWarnings>true</SuppressAotAnalysisWarnings>

<!-- Forced by ILLink targets; we should fix the SDK -->
<SelfContained>true</SelfContained>

<!-- Works around https://github.com/dotnet/runtime/issues/73926 -->
<!-- RequiresUnreferenceCodeAttribute method called -->
<NoWarn>$(NoWarn);IL2026;IL2116</NoWarn>
<!-- Invalid use of DynamicallyAccessedMembersAttribute -->
<NoWarn>$(NoWarn);IL2041;IL2042;IL2043;IL2056</NoWarn>
<!-- Reference to removed attribute type -->
<NoWarn>$(NoWarn);IL2045</NoWarn>
<!-- RequiresUnreferencedCodeAttribute mismatch on virtual override -->
<NoWarn>$(NoWarn);IL2046</NoWarn>
<!-- COM marshalling warning -->
<NoWarn>$(NoWarn);IL2050</NoWarn>
<!-- Reflection intrinsics with unknown arguments -->
<NoWarn>$(NoWarn);IL2032;IL2055;IL2057;IL2058;IL2059;IL2060;IL2061;IL2096</NoWarn>
<!-- Unknown values passed to locations with DynamicallyAccessedMemberTypes -->
<NoWarn>$(NoWarn);IL2062;IL2063;IL2064;IL2065;IL2066</NoWarn>
<!-- Unsatisfied DynamicallyAccessedMembers requirements -->
<NoWarn>$(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>
<!-- DynamicallyAccessedMembersAttribute mismatch on virtual override -->
<NoWarn>$(NoWarn);IL2092;IL2093;IL2094;IL2095</NoWarn>
<!-- DynamicallyAccessedMembersAttribute used on unsupported member -->
<NoWarn>$(NoWarn);IL2097;IL2098;IL2099;IL2106</NoWarn>
<!-- Unknown value passed to Expression.Property -->
<NoWarn>$(NoWarn);IL2103</NoWarn>
<!-- Multiple methods associated with state machine type or user method -->
<NoWarn>$(NoWarn);IL2107;IL2117</NoWarn>
<!-- Unannotated type derived from base type with RequiresUnreferencedCode -->
<NoWarn>$(NoWarn);IL2109</NoWarn>
<!-- Reflection access to members with DynamicallyAccessedMembers requirements -->
<NoWarn>$(NoWarn);IL2110;IL2111;IL2114;IL2115</NoWarn>
<!-- Reflection access to members with RequiresUnreferencedCode -->
<NoWarn>$(NoWarn);IL2112;IL2113</NoWarn>
<!-- Reflection access to compiler-generated code -->
<NoWarn>$(NoWarn);IL2118;IL2119;IL2120</NoWarn>

</PropertyGroup>

<Import Project="$(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.SingleEntry.targets" Condition="'$(TestNativeAot)' == 'true'" />
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,9 @@
"dotnet": "7.0.100-preview.7.22377.5"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22416.1",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22416.1",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22416.1",
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22418.4",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22418.4",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22418.4",
"Microsoft.Build.NoTargets": "3.5.0",
"Microsoft.Build.Traversal": "3.1.6",
"Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6"
Expand Down
1 change: 1 addition & 0 deletions src/coreclr/dlls/mscorrc/mscorrc.rc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -271,6 +271,7 @@ BEGIN
IDS_EE_BADMARSHAL_ABSTRACTRETCRITICALHANDLE "Returned CriticalHandles cannot be abstract."
IDS_EE_BADMARSHAL_CUSTOMMARSHALER "Custom marshalers are only allowed on classes, strings, arrays, and boxed value types."
IDS_EE_BADMARSHAL_GENERICS_RESTRICTION "Non-blittable generic types cannot be marshaled."
IDS_EE_BADMARSHAL_INT128_RESTRICTION "System.Int128 and System.UInt128 cannot be passed by value to unmanaged."
IDS_EE_BADMARSHAL_AUTOLAYOUT "Structures marked with [StructLayout(LayoutKind.Auto)] cannot be marshaled."
IDS_EE_BADMARSHAL_STRING_OUT "Cannot marshal a string by-value with the [Out] attribute."
IDS_EE_BADMARSHAL_MARSHAL_DISABLED "Cannot marshal managed types when the runtime marshalling system is disabled."
Expand Down
1 change: 1 addition & 0 deletions src/coreclr/dlls/mscorrc/resource.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -283,6 +283,7 @@
#define IDS_EE_BADMARSHAL_ABSTRACTOUTCRITICALHANDLE 0x1a63
#define IDS_EE_BADMARSHAL_RETURNCHCOMTONATIVE 0x1a64
#define IDS_EE_BADMARSHAL_CRITICALHANDLE 0x1a65
#define IDS_EE_BADMARSHAL_INT128_RESTRICTION 0x1a66

#define IDS_EE_BADMARSHAL_ABSTRACTRETCRITICALHANDLE 0x1a6a
#define IDS_EE_CH_IN_VARIANT_NOT_SUPPORTED 0x1a6b
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
[automated] Merge branch 'release/7.0-rc1' => 'release/7.0' by dotnet-maestro-bot · Pull Request #74205 · dotnet/runtime · GitHub
Skip to content
[automated] Merge branch 'release/7.0-rc1' => 'release/7.0'#74205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ViktorHofer
merged 8 commits into

from

Aug 20, 2022
 Merged


[automated] Merge branch 'release/7.0-rc1' => 'release/7.0'
#74205
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
f908dbc

[Ppc64le] bug fixes (#74131)


alhad-deshpande Aug 19, 2022
195178b

Improve ControlledExecution tests (#74186)


github-actions[bot] Aug 19, 2022
1af9cfd

Shorten the workload name even more (#74176)


github-actions[bot] Aug 19, 2022
d9c1700

[release/7.0-rc1] Disable Int128 use in by value ABI scenarios, and f…


github-actions[bot] Aug 20, 2022
39d767a

Don't NativeAOT crossgen on ARM64 (#74221)


github-actions[bot] Aug 20, 2022
c7cab43

[release/7.0-rc1] Add a way to suppress all trimming warnings (#74220)


github-actions[bot] Aug 20, 2022
37193fd

Don't track current field of state machines (#74216)


github-actions[bot] Aug 20, 2022
3c73d4d

[release/7.0] Update arcade to 7.0.0-beta.22418.4 (#74210)


hoyosjs Aug 20, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


76 changes: 38 additions & 38 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,77 +54,77 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22409.1">
 <Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -250,9 +250,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>5ebf69650b9f7b4ecab485be840b3022420f7812</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

32 changes: 16 additions & 16 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,22 +54,22 @@
 <!-- SDK dependencies -->
 <MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetApiCompatVersion>7.0.0-beta.22416.1</MicrosoftDotNetApiCompatVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22416.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>7.0.0-beta.22416.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22416.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22416.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22416.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22416.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22416.1</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22416.1</MicrosoftDotNetPackageTestingVersion>
 <MicrosoftDotNetApiCompatVersion>7.0.0-beta.22418.4</MicrosoftDotNetApiCompatVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22418.4</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>7.0.0-beta.22418.4</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22418.4</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22418.4</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22418.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22418.4</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22418.4</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22418.4</MicrosoftDotNetPackageTestingVersion>
 <!-- NuGet dependencies -->
 <NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
 <!-- Installer dependencies -->
Expand Down

37 changes: 37 additions & 0 deletions
eng/common/sdl/sdl.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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
}

37 changes: 17 additions & 20 deletions
eng/common/templates/steps/execute-sdl.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 }}
Expand All@@ -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 }}
Expand Down

39 changes: 2 additions & 37 deletions
eng/testing/tests.singlefile.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,48 +26,13 @@
 <IlcBuildTasksPath>$(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
 <IlcSdkPath>$(CoreCLRAotSdkDir)</IlcSdkPath>
 <IlcFrameworkPath>$(NetCoreAppCurrentTestHostSharedFrameworkPath)</IlcFrameworkPath>
 <NoWarn>$(NoWarn);IL3050;IL3051;IL3052;IL3054;IL3055;IL1005;IL3002</NoWarn>
 <NoWarn>$(NoWarn);IL1005;IL3002</NoWarn>
 <TrimMode>partial</TrimMode>
 <TrimmerSingleWarn>false</TrimmerSingleWarn>
 <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
 <SuppressAotAnalysisWarnings>true</SuppressAotAnalysisWarnings>

 <!-- Forced by ILLink targets; we should fix the SDK -->
 <SelfContained>true</SelfContained>

 <!-- Works around https://github.com/dotnet/runtime/issues/73926 -->
 <!-- RequiresUnreferenceCodeAttribute method called -->
 <NoWarn>$(NoWarn);IL2026;IL2116</NoWarn>
 <!-- Invalid use of DynamicallyAccessedMembersAttribute -->
 <NoWarn>$(NoWarn);IL2041;IL2042;IL2043;IL2056</NoWarn>
 <!-- Reference to removed attribute type -->
 <NoWarn>$(NoWarn);IL2045</NoWarn>
 <!-- RequiresUnreferencedCodeAttribute mismatch on virtual override -->
 <NoWarn>$(NoWarn);IL2046</NoWarn>
 <!-- COM marshalling warning -->
 <NoWarn>$(NoWarn);IL2050</NoWarn>
 <!-- Reflection intrinsics with unknown arguments -->
 <NoWarn>$(NoWarn);IL2032;IL2055;IL2057;IL2058;IL2059;IL2060;IL2061;IL2096</NoWarn>
 <!-- Unknown values passed to locations with DynamicallyAccessedMemberTypes -->
 <NoWarn>$(NoWarn);IL2062;IL2063;IL2064;IL2065;IL2066</NoWarn>
 <!-- Unsatisfied DynamicallyAccessedMembers requirements -->
 <NoWarn>$(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>
 <!-- DynamicallyAccessedMembersAttribute mismatch on virtual override -->
 <NoWarn>$(NoWarn);IL2092;IL2093;IL2094;IL2095</NoWarn>
 <!-- DynamicallyAccessedMembersAttribute used on unsupported member -->
 <NoWarn>$(NoWarn);IL2097;IL2098;IL2099;IL2106</NoWarn>
 <!-- Unknown value passed to Expression.Property -->
 <NoWarn>$(NoWarn);IL2103</NoWarn>
 <!-- Multiple methods associated with state machine type or user method -->
 <NoWarn>$(NoWarn);IL2107;IL2117</NoWarn>
 <!-- Unannotated type derived from base type with RequiresUnreferencedCode -->
 <NoWarn>$(NoWarn);IL2109</NoWarn>
 <!-- Reflection access to members with DynamicallyAccessedMembers requirements -->
 <NoWarn>$(NoWarn);IL2110;IL2111;IL2114;IL2115</NoWarn>
 <!-- Reflection access to members with RequiresUnreferencedCode -->
 <NoWarn>$(NoWarn);IL2112;IL2113</NoWarn>
 <!-- Reflection access to compiler-generated code -->
 <NoWarn>$(NoWarn);IL2118;IL2119;IL2120</NoWarn>

 </PropertyGroup>

 <Import Project="$(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.SingleEntry.targets" Condition="'$(TestNativeAot)' == 'true'" />
Expand Down

6 changes: 3 additions & 3 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,9 @@
 "dotnet": "7.0.100-preview.7.22377.5"
 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22416.1",
 "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22416.1",
 "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22416.1",
 "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22418.4",
 "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22418.4",
 "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22418.4",
 "Microsoft.Build.NoTargets": "3.5.0",
 "Microsoft.Build.Traversal": "3.1.6",
 "Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6"
Expand Down

1 change: 1 addition & 0 deletions
src/coreclr/dlls/mscorrc/mscorrc.rc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -271,6 +271,7 @@ BEGIN
 IDS_EE_BADMARSHAL_ABSTRACTRETCRITICALHANDLE "Returned CriticalHandles cannot be abstract."
 IDS_EE_BADMARSHAL_CUSTOMMARSHALER "Custom marshalers are only allowed on classes, strings, arrays, and boxed value types."
 IDS_EE_BADMARSHAL_GENERICS_RESTRICTION "Non-blittable generic types cannot be marshaled."
 IDS_EE_BADMARSHAL_INT128_RESTRICTION "System.Int128 and System.UInt128 cannot be passed by value to unmanaged."
 IDS_EE_BADMARSHAL_AUTOLAYOUT "Structures marked with [StructLayout(LayoutKind.Auto)] cannot be marshaled."
 IDS_EE_BADMARSHAL_STRING_OUT "Cannot marshal a string by-value with the [Out] attribute."
 IDS_EE_BADMARSHAL_MARSHAL_DISABLED "Cannot marshal managed types when the runtime marshalling system is disabled."
Expand Down

1 change: 1 addition & 0 deletions
src/coreclr/dlls/mscorrc/resource.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -283,6 +283,7 @@
#define IDS_EE_BADMARSHAL_ABSTRACTOUTCRITICALHANDLE 0x1a63
#define IDS_EE_BADMARSHAL_RETURNCHCOMTONATIVE 0x1a64
#define IDS_EE_BADMARSHAL_CRITICALHANDLE 0x1a65
#define IDS_EE_BADMARSHAL_INT128_RESTRICTION 0x1a66

#define IDS_EE_BADMARSHAL_ABSTRACTRETCRITICALHANDLE 0x1a6a
#define IDS_EE_CH_IN_VARIANT_NOT_SUPPORTED 0x1a6b
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[automated] Merge branch 'release/7.0-rc1' => 'release/7.0' by dotnet-maestro-bot · Pull Request #74205 · dotnet/runtime · GitHub
Skip to content
[automated] Merge branch 'release/7.0-rc1' => 'release/7.0'#74205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ViktorHofer
merged 8 commits into

from

Aug 20, 2022
 Merged


[automated] Merge branch 'release/7.0-rc1' => 'release/7.0'
#74205
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
f908dbc

[Ppc64le] bug fixes (#74131)


alhad-deshpande Aug 19, 2022
195178b

Improve ControlledExecution tests (#74186)


github-actions[bot] Aug 19, 2022
1af9cfd

Shorten the workload name even more (#74176)


github-actions[bot] Aug 19, 2022
d9c1700

[release/7.0-rc1] Disable Int128 use in by value ABI scenarios, and f…


github-actions[bot] Aug 20, 2022
39d767a

Don't NativeAOT crossgen on ARM64 (#74221)


github-actions[bot] Aug 20, 2022
c7cab43

[release/7.0-rc1] Add a way to suppress all trimming warnings (#74220)


github-actions[bot] Aug 20, 2022
37193fd

Don't track current field of state machines (#74216)


github-actions[bot] Aug 20, 2022
3c73d4d

[release/7.0] Update arcade to 7.0.0-beta.22418.4 (#74210)


hoyosjs Aug 20, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


76 changes: 38 additions & 38 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,77 +54,77 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22409.1">
 <Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -250,9 +250,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>5ebf69650b9f7b4ecab485be840b3022420f7812</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

32 changes: 16 additions & 16 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,22 +54,22 @@
 <!-- SDK dependencies -->
 <MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetApiCompatVersion>7.0.0-beta.22416.1</MicrosoftDotNetApiCompatVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22416.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>7.0.0-beta.22416.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22416.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22416.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22416.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22416.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22416.1</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22416.1</MicrosoftDotNetPackageTestingVersion>
 <MicrosoftDotNetApiCompatVersion>7.0.0-beta.22418.4</MicrosoftDotNetApiCompatVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22418.4</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>7.0.0-beta.22418.4</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22418.4</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22418.4</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22418.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22418.4</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22418.4</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22418.4</MicrosoftDotNetPackageTestingVersion>
 <!-- NuGet dependencies -->
 <NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
 <!-- Installer dependencies -->
Expand Down

37 changes: 37 additions & 0 deletions
eng/common/sdl/sdl.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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
}

37 changes: 17 additions & 20 deletions
eng/common/templates/steps/execute-sdl.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 }}
Expand All@@ -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 }}
Expand Down

39 changes: 2 additions & 37 deletions
eng/testing/tests.singlefile.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,48 +26,13 @@
 <IlcBuildTasksPath>$(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
 <IlcSdkPath>$(CoreCLRAotSdkDir)</IlcSdkPath>
 <IlcFrameworkPath>$(NetCoreAppCurrentTestHostSharedFrameworkPath)</IlcFrameworkPath>
 <NoWarn>$(NoWarn);IL3050;IL3051;IL3052;IL3054;IL3055;IL1005;IL3002</NoWarn>
 <NoWarn>$(NoWarn);IL1005;IL3002</NoWarn>
 <TrimMode>partial</TrimMode>
 <TrimmerSingleWarn>false</TrimmerSingleWarn>
 <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
 <SuppressAotAnalysisWarnings>true</SuppressAotAnalysisWarnings>

 <!-- Forced by ILLink targets; we should fix the SDK -->
 <SelfContained>true</SelfContained>

 <!-- Works around https://github.com/dotnet/runtime/issues/73926 -->
 <!-- RequiresUnreferenceCodeAttribute method called -->
 <NoWarn>$(NoWarn);IL2026;IL2116</NoWarn>
 <!-- Invalid use of DynamicallyAccessedMembersAttribute -->
 <NoWarn>$(NoWarn);IL2041;IL2042;IL2043;IL2056</NoWarn>
 <!-- Reference to removed attribute type -->
 <NoWarn>$(NoWarn);IL2045</NoWarn>
 <!-- RequiresUnreferencedCodeAttribute mismatch on virtual override -->
 <NoWarn>$(NoWarn);IL2046</NoWarn>
 <!-- COM marshalling warning -->
 <NoWarn>$(NoWarn);IL2050</NoWarn>
 <!-- Reflection intrinsics with unknown arguments -->
 <NoWarn>$(NoWarn);IL2032;IL2055;IL2057;IL2058;IL2059;IL2060;IL2061;IL2096</NoWarn>
 <!-- Unknown values passed to locations with DynamicallyAccessedMemberTypes -->
 <NoWarn>$(NoWarn);IL2062;IL2063;IL2064;IL2065;IL2066</NoWarn>
 <!-- Unsatisfied DynamicallyAccessedMembers requirements -->
 <NoWarn>$(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>
 <!-- DynamicallyAccessedMembersAttribute mismatch on virtual override -->
 <NoWarn>$(NoWarn);IL2092;IL2093;IL2094;IL2095</NoWarn>
 <!-- DynamicallyAccessedMembersAttribute used on unsupported member -->
 <NoWarn>$(NoWarn);IL2097;IL2098;IL2099;IL2106</NoWarn>
 <!-- Unknown value passed to Expression.Property -->
 <NoWarn>$(NoWarn);IL2103</NoWarn>
 <!-- Multiple methods associated with state machine type or user method -->
 <NoWarn>$(NoWarn);IL2107;IL2117</NoWarn>
 <!-- Unannotated type derived from base type with RequiresUnreferencedCode -->
 <NoWarn>$(NoWarn);IL2109</NoWarn>
 <!-- Reflection access to members with DynamicallyAccessedMembers requirements -->
 <NoWarn>$(NoWarn);IL2110;IL2111;IL2114;IL2115</NoWarn>
 <!-- Reflection access to members with RequiresUnreferencedCode -->
 <NoWarn>$(NoWarn);IL2112;IL2113</NoWarn>
 <!-- Reflection access to compiler-generated code -->
 <NoWarn>$(NoWarn);IL2118;IL2119;IL2120</NoWarn>

 </PropertyGroup>

 <Import Project="$(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.SingleEntry.targets" Condition="'$(TestNativeAot)' == 'true'" />
Expand Down

6 changes: 3 additions & 3 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,9 @@
 "dotnet": "7.0.100-preview.7.22377.5"
 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22416.1",
 "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22416.1",
 "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22416.1",
 "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22418.4",
 "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22418.4",
 "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22418.4",
 "Microsoft.Build.NoTargets": "3.5.0",
 "Microsoft.Build.Traversal": "3.1.6",
 "Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6"
Expand Down

1 change: 1 addition & 0 deletions
src/coreclr/dlls/mscorrc/mscorrc.rc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -271,6 +271,7 @@ BEGIN
 IDS_EE_BADMARSHAL_ABSTRACTRETCRITICALHANDLE "Returned CriticalHandles cannot be abstract."
 IDS_EE_BADMARSHAL_CUSTOMMARSHALER "Custom marshalers are only allowed on classes, strings, arrays, and boxed value types."
 IDS_EE_BADMARSHAL_GENERICS_RESTRICTION "Non-blittable generic types cannot be marshaled."
 IDS_EE_BADMARSHAL_INT128_RESTRICTION "System.Int128 and System.UInt128 cannot be passed by value to unmanaged."
 IDS_EE_BADMARSHAL_AUTOLAYOUT "Structures marked with [StructLayout(LayoutKind.Auto)] cannot be marshaled."
 IDS_EE_BADMARSHAL_STRING_OUT "Cannot marshal a string by-value with the [Out] attribute."
 IDS_EE_BADMARSHAL_MARSHAL_DISABLED "Cannot marshal managed types when the runtime marshalling system is disabled."
Expand Down

1 change: 1 addition & 0 deletions
src/coreclr/dlls/mscorrc/resource.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -283,6 +283,7 @@
#define IDS_EE_BADMARSHAL_ABSTRACTOUTCRITICALHANDLE 0x1a63
#define IDS_EE_BADMARSHAL_RETURNCHCOMTONATIVE 0x1a64
#define IDS_EE_BADMARSHAL_CRITICALHANDLE 0x1a65
#define IDS_EE_BADMARSHAL_INT128_RESTRICTION 0x1a66

#define IDS_EE_BADMARSHAL_ABSTRACTRETCRITICALHANDLE 0x1a6a
#define IDS_EE_CH_IN_VARIANT_NOT_SUPPORTED 0x1a6b
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[automated] Merge branch 'release/7.0-rc1' => 'release/7.0' by dotnet-maestro-bot · Pull Request #74205 · dotnet/runtime · GitHub
Skip to content
[automated] Merge branch 'release/7.0-rc1' => 'release/7.0'#74205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ViktorHofer
merged 8 commits into

from

Aug 20, 2022
 Merged


[automated] Merge branch 'release/7.0-rc1' => 'release/7.0'
#74205
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
f908dbc

[Ppc64le] bug fixes (#74131)


alhad-deshpande Aug 19, 2022
195178b

Improve ControlledExecution tests (#74186)


github-actions[bot] Aug 19, 2022
1af9cfd

Shorten the workload name even more (#74176)


github-actions[bot] Aug 19, 2022
d9c1700

[release/7.0-rc1] Disable Int128 use in by value ABI scenarios, and f…


github-actions[bot] Aug 20, 2022
39d767a

Don't NativeAOT crossgen on ARM64 (#74221)


github-actions[bot] Aug 20, 2022
c7cab43

[release/7.0-rc1] Add a way to suppress all trimming warnings (#74220)


github-actions[bot] Aug 20, 2022
37193fd

Don't track current field of state machines (#74216)


github-actions[bot] Aug 20, 2022
3c73d4d

[release/7.0] Update arcade to 7.0.0-beta.22418.4 (#74210)


hoyosjs Aug 20, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


76 changes: 38 additions & 38 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,77 +54,77 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22409.1">
 <Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -250,9 +250,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>5ebf69650b9f7b4ecab485be840b3022420f7812</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

32 changes: 16 additions & 16 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,22 +54,22 @@
 <!-- SDK dependencies -->
 <MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetApiCompatVersion>7.0.0-beta.22416.1</MicrosoftDotNetApiCompatVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22416.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>7.0.0-beta.22416.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22416.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22416.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22416.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22416.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22416.1</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22416.1</MicrosoftDotNetPackageTestingVersion>
 <MicrosoftDotNetApiCompatVersion>7.0.0-beta.22418.4</MicrosoftDotNetApiCompatVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22418.4</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>7.0.0-beta.22418.4</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22418.4</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22418.4</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22418.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22418.4</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22418.4</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22418.4</MicrosoftDotNetPackageTestingVersion>
 <!-- NuGet dependencies -->
 <NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
 <!-- Installer dependencies -->
Expand Down

37 changes: 37 additions & 0 deletions
eng/common/sdl/sdl.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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
}

37 changes: 17 additions & 20 deletions
eng/common/templates/steps/execute-sdl.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 }}
Expand All@@ -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 }}
Expand Down

39 changes: 2 additions & 37 deletions
eng/testing/tests.singlefile.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,48 +26,13 @@
 <IlcBuildTasksPath>$(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
 <IlcSdkPath>$(CoreCLRAotSdkDir)</IlcSdkPath>
 <IlcFrameworkPath>$(NetCoreAppCurrentTestHostSharedFrameworkPath)</IlcFrameworkPath>
 <NoWarn>$(NoWarn);IL3050;IL3051;IL3052;IL3054;IL3055;IL1005;IL3002</NoWarn>
 <NoWarn>$(NoWarn);IL1005;IL3002</NoWarn>
 <TrimMode>partial</TrimMode>
 <TrimmerSingleWarn>false</TrimmerSingleWarn>
 <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
 <SuppressAotAnalysisWarnings>true</SuppressAotAnalysisWarnings>

 <!-- Forced by ILLink targets; we should fix the SDK -->
 <SelfContained>true</SelfContained>

 <!-- Works around https://github.com/dotnet/runtime/issues/73926 -->
 <!-- RequiresUnreferenceCodeAttribute method called -->
 <NoWarn>$(NoWarn);IL2026;IL2116</NoWarn>
 <!-- Invalid use of DynamicallyAccessedMembersAttribute -->
 <NoWarn>$(NoWarn);IL2041;IL2042;IL2043;IL2056</NoWarn>
 <!-- Reference to removed attribute type -->
 <NoWarn>$(NoWarn);IL2045</NoWarn>
 <!-- RequiresUnreferencedCodeAttribute mismatch on virtual override -->
 <NoWarn>$(NoWarn);IL2046</NoWarn>
 <!-- COM marshalling warning -->
 <NoWarn>$(NoWarn);IL2050</NoWarn>
 <!-- Reflection intrinsics with unknown arguments -->
 <NoWarn>$(NoWarn);IL2032;IL2055;IL2057;IL2058;IL2059;IL2060;IL2061;IL2096</NoWarn>
 <!-- Unknown values passed to locations with DynamicallyAccessedMemberTypes -->
 <NoWarn>$(NoWarn);IL2062;IL2063;IL2064;IL2065;IL2066</NoWarn>
 <!-- Unsatisfied DynamicallyAccessedMembers requirements -->
 <NoWarn>$(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>
 <!-- DynamicallyAccessedMembersAttribute mismatch on virtual override -->
 <NoWarn>$(NoWarn);IL2092;IL2093;IL2094;IL2095</NoWarn>
 <!-- DynamicallyAccessedMembersAttribute used on unsupported member -->
 <NoWarn>$(NoWarn);IL2097;IL2098;IL2099;IL2106</NoWarn>
 <!-- Unknown value passed to Expression.Property -->
 <NoWarn>$(NoWarn);IL2103</NoWarn>
 <!-- Multiple methods associated with state machine type or user method -->
 <NoWarn>$(NoWarn);IL2107;IL2117</NoWarn>
 <!-- Unannotated type derived from base type with RequiresUnreferencedCode -->
 <NoWarn>$(NoWarn);IL2109</NoWarn>
 <!-- Reflection access to members with DynamicallyAccessedMembers requirements -->
 <NoWarn>$(NoWarn);IL2110;IL2111;IL2114;IL2115</NoWarn>
 <!-- Reflection access to members with RequiresUnreferencedCode -->
 <NoWarn>$(NoWarn);IL2112;IL2113</NoWarn>
 <!-- Reflection access to compiler-generated code -->
 <NoWarn>$(NoWarn);IL2118;IL2119;IL2120</NoWarn>

 </PropertyGroup>

 <Import Project="$(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.SingleEntry.targets" Condition="'$(TestNativeAot)' == 'true'" />
Expand Down

6 changes: 3 additions & 3 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,9 @@
 "dotnet": "7.0.100-preview.7.22377.5"
 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22416.1",
 "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22416.1",
 "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22416.1",
 "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22418.4",
 "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22418.4",
 "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22418.4",
 "Microsoft.Build.NoTargets": "3.5.0",
 "Microsoft.Build.Traversal": "3.1.6",
 "Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6"
Expand Down

1 change: 1 addition & 0 deletions
src/coreclr/dlls/mscorrc/mscorrc.rc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -271,6 +271,7 @@ BEGIN
 IDS_EE_BADMARSHAL_ABSTRACTRETCRITICALHANDLE "Returned CriticalHandles cannot be abstract."
 IDS_EE_BADMARSHAL_CUSTOMMARSHALER "Custom marshalers are only allowed on classes, strings, arrays, and boxed value types."
 IDS_EE_BADMARSHAL_GENERICS_RESTRICTION "Non-blittable generic types cannot be marshaled."
 IDS_EE_BADMARSHAL_INT128_RESTRICTION "System.Int128 and System.UInt128 cannot be passed by value to unmanaged."
 IDS_EE_BADMARSHAL_AUTOLAYOUT "Structures marked with [StructLayout(LayoutKind.Auto)] cannot be marshaled."
 IDS_EE_BADMARSHAL_STRING_OUT "Cannot marshal a string by-value with the [Out] attribute."
 IDS_EE_BADMARSHAL_MARSHAL_DISABLED "Cannot marshal managed types when the runtime marshalling system is disabled."
Expand Down

1 change: 1 addition & 0 deletions
src/coreclr/dlls/mscorrc/resource.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -283,6 +283,7 @@
#define IDS_EE_BADMARSHAL_ABSTRACTOUTCRITICALHANDLE 0x1a63
#define IDS_EE_BADMARSHAL_RETURNCHCOMTONATIVE 0x1a64
#define IDS_EE_BADMARSHAL_CRITICALHANDLE 0x1a65
#define IDS_EE_BADMARSHAL_INT128_RESTRICTION 0x1a66

#define IDS_EE_BADMARSHAL_ABSTRACTRETCRITICALHANDLE 0x1a6a
#define IDS_EE_CH_IN_VARIANT_NOT_SUPPORTED 0x1a6b
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
[automated] Merge branch 'release/7.0-rc1' => 'release/7.0' by dotnet-maestro-bot · Pull Request #74205 · dotnet/runtime · GitHub
Skip to content
[automated] Merge branch 'release/7.0-rc1' => 'release/7.0'#74205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ViktorHofer
merged 8 commits into

from

Aug 20, 2022
 Merged


[automated] Merge branch 'release/7.0-rc1' => 'release/7.0'
#74205
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
f908dbc

[Ppc64le] bug fixes (#74131)


alhad-deshpande Aug 19, 2022
195178b

Improve ControlledExecution tests (#74186)


github-actions[bot] Aug 19, 2022
1af9cfd

Shorten the workload name even more (#74176)


github-actions[bot] Aug 19, 2022
d9c1700

[release/7.0-rc1] Disable Int128 use in by value ABI scenarios, and f…


github-actions[bot] Aug 20, 2022
39d767a

Don't NativeAOT crossgen on ARM64 (#74221)


github-actions[bot] Aug 20, 2022
c7cab43

[release/7.0-rc1] Add a way to suppress all trimming warnings (#74220)


github-actions[bot] Aug 20, 2022
37193fd

Don't track current field of state machines (#74216)


github-actions[bot] Aug 20, 2022
3c73d4d

[release/7.0] Update arcade to 7.0.0-beta.22418.4 (#74210)


hoyosjs Aug 20, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


76 changes: 38 additions & 38 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,77 +54,77 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22409.1">
 <Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -250,9 +250,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>5ebf69650b9f7b4ecab485be840b3022420f7812</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

32 changes: 16 additions & 16 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,22 +54,22 @@
 <!-- SDK dependencies -->
 <MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetApiCompatVersion>7.0.0-beta.22416.1</MicrosoftDotNetApiCompatVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22416.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>7.0.0-beta.22416.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22416.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22416.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22416.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22416.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22416.1</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22416.1</MicrosoftDotNetPackageTestingVersion>
 <MicrosoftDotNetApiCompatVersion>7.0.0-beta.22418.4</MicrosoftDotNetApiCompatVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22418.4</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>7.0.0-beta.22418.4</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22418.4</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22418.4</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22418.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22418.4</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22418.4</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22418.4</MicrosoftDotNetPackageTestingVersion>
 <!-- NuGet dependencies -->
 <NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
 <!-- Installer dependencies -->
Expand Down

37 changes: 37 additions & 0 deletions
eng/common/sdl/sdl.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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
}

37 changes: 17 additions & 20 deletions
eng/common/templates/steps/execute-sdl.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 }}
Expand All@@ -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 }}
Expand Down

39 changes: 2 additions & 37 deletions
eng/testing/tests.singlefile.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,48 +26,13 @@
 <IlcBuildTasksPath>$(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
 <IlcSdkPath>$(CoreCLRAotSdkDir)</IlcSdkPath>
 <IlcFrameworkPath>$(NetCoreAppCurrentTestHostSharedFrameworkPath)</IlcFrameworkPath>
 <NoWarn>$(NoWarn);IL3050;IL3051;IL3052;IL3054;IL3055;IL1005;IL3002</NoWarn>
 <NoWarn>$(NoWarn);IL1005;IL3002</NoWarn>
 <TrimMode>partial</TrimMode>
 <TrimmerSingleWarn>false</TrimmerSingleWarn>
 <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
 <SuppressAotAnalysisWarnings>true</SuppressAotAnalysisWarnings>

 <!-- Forced by ILLink targets; we should fix the SDK -->
 <SelfContained>true</SelfContained>

 <!-- Works around https://github.com/dotnet/runtime/issues/73926 -->
 <!-- RequiresUnreferenceCodeAttribute method called -->
 <NoWarn>$(NoWarn);IL2026;IL2116</NoWarn>
 <!-- Invalid use of DynamicallyAccessedMembersAttribute -->
 <NoWarn>$(NoWarn);IL2041;IL2042;IL2043;IL2056</NoWarn>
 <!-- Reference to removed attribute type -->
 <NoWarn>$(NoWarn);IL2045</NoWarn>
 <!-- RequiresUnreferencedCodeAttribute mismatch on virtual override -->
 <NoWarn>$(NoWarn);IL2046</NoWarn>
 <!-- COM marshalling warning -->
 <NoWarn>$(NoWarn);IL2050</NoWarn>
 <!-- Reflection intrinsics with unknown arguments -->
 <NoWarn>$(NoWarn);IL2032;IL2055;IL2057;IL2058;IL2059;IL2060;IL2061;IL2096</NoWarn>
 <!-- Unknown values passed to locations with DynamicallyAccessedMemberTypes -->
 <NoWarn>$(NoWarn);IL2062;IL2063;IL2064;IL2065;IL2066</NoWarn>
 <!-- Unsatisfied DynamicallyAccessedMembers requirements -->
 <NoWarn>$(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>
 <!-- DynamicallyAccessedMembersAttribute mismatch on virtual override -->
 <NoWarn>$(NoWarn);IL2092;IL2093;IL2094;IL2095</NoWarn>
 <!-- DynamicallyAccessedMembersAttribute used on unsupported member -->
 <NoWarn>$(NoWarn);IL2097;IL2098;IL2099;IL2106</NoWarn>
 <!-- Unknown value passed to Expression.Property -->
 <NoWarn>$(NoWarn);IL2103</NoWarn>
 <!-- Multiple methods associated with state machine type or user method -->
 <NoWarn>$(NoWarn);IL2107;IL2117</NoWarn>
 <!-- Unannotated type derived from base type with RequiresUnreferencedCode -->
 <NoWarn>$(NoWarn);IL2109</NoWarn>
 <!-- Reflection access to members with DynamicallyAccessedMembers requirements -->
 <NoWarn>$(NoWarn);IL2110;IL2111;IL2114;IL2115</NoWarn>
 <!-- Reflection access to members with RequiresUnreferencedCode -->
 <NoWarn>$(NoWarn);IL2112;IL2113</NoWarn>
 <!-- Reflection access to compiler-generated code -->
 <NoWarn>$(NoWarn);IL2118;IL2119;IL2120</NoWarn>

 </PropertyGroup>

 <Import Project="$(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.SingleEntry.targets" Condition="'$(TestNativeAot)' == 'true'" />
Expand Down

6 changes: 3 additions & 3 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,9 @@
 "dotnet": "7.0.100-preview.7.22377.5"
 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22416.1",
 "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22416.1",
 "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22416.1",
 "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22418.4",
 "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22418.4",
 "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22418.4",
 "Microsoft.Build.NoTargets": "3.5.0",
 "Microsoft.Build.Traversal": "3.1.6",
 "Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6"
Expand Down

1 change: 1 addition & 0 deletions
src/coreclr/dlls/mscorrc/mscorrc.rc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -271,6 +271,7 @@ BEGIN
 IDS_EE_BADMARSHAL_ABSTRACTRETCRITICALHANDLE "Returned CriticalHandles cannot be abstract."
 IDS_EE_BADMARSHAL_CUSTOMMARSHALER "Custom marshalers are only allowed on classes, strings, arrays, and boxed value types."
 IDS_EE_BADMARSHAL_GENERICS_RESTRICTION "Non-blittable generic types cannot be marshaled."
 IDS_EE_BADMARSHAL_INT128_RESTRICTION "System.Int128 and System.UInt128 cannot be passed by value to unmanaged."
 IDS_EE_BADMARSHAL_AUTOLAYOUT "Structures marked with [StructLayout(LayoutKind.Auto)] cannot be marshaled."
 IDS_EE_BADMARSHAL_STRING_OUT "Cannot marshal a string by-value with the [Out] attribute."
 IDS_EE_BADMARSHAL_MARSHAL_DISABLED "Cannot marshal managed types when the runtime marshalling system is disabled."
Expand Down

1 change: 1 addition & 0 deletions
src/coreclr/dlls/mscorrc/resource.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -283,6 +283,7 @@
#define IDS_EE_BADMARSHAL_ABSTRACTOUTCRITICALHANDLE 0x1a63
#define IDS_EE_BADMARSHAL_RETURNCHCOMTONATIVE 0x1a64
#define IDS_EE_BADMARSHAL_CRITICALHANDLE 0x1a65
#define IDS_EE_BADMARSHAL_INT128_RESTRICTION 0x1a66

#define IDS_EE_BADMARSHAL_ABSTRACTRETCRITICALHANDLE 0x1a6a
#define IDS_EE_CH_IN_VARIANT_NOT_SUPPORTED 0x1a6b
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[automated] Merge branch 'release/7.0-rc1' => 'release/7.0' by dotnet-maestro-bot · Pull Request #74205 · dotnet/runtime · GitHub
Skip to content
[automated] Merge branch 'release/7.0-rc1' => 'release/7.0'#74205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ViktorHofer
merged 8 commits into

from

Aug 20, 2022
 Merged


[automated] Merge branch 'release/7.0-rc1' => 'release/7.0'
#74205
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
f908dbc

[Ppc64le] bug fixes (#74131)


alhad-deshpande Aug 19, 2022
195178b

Improve ControlledExecution tests (#74186)


github-actions[bot] Aug 19, 2022
1af9cfd

Shorten the workload name even more (#74176)


github-actions[bot] Aug 19, 2022
d9c1700

[release/7.0-rc1] Disable Int128 use in by value ABI scenarios, and f…


github-actions[bot] Aug 20, 2022
39d767a

Don't NativeAOT crossgen on ARM64 (#74221)


github-actions[bot] Aug 20, 2022
c7cab43

[release/7.0-rc1] Add a way to suppress all trimming warnings (#74220)


github-actions[bot] Aug 20, 2022
37193fd

Don't track current field of state machines (#74216)


github-actions[bot] Aug 20, 2022
3c73d4d

[release/7.0] Update arcade to 7.0.0-beta.22418.4 (#74210)


hoyosjs Aug 20, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


76 changes: 38 additions & 38 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,77 +54,77 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22409.1">
 <Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -250,9 +250,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>5ebf69650b9f7b4ecab485be840b3022420f7812</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

32 changes: 16 additions & 16 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,22 +54,22 @@
 <!-- SDK dependencies -->
 <MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetApiCompatVersion>7.0.0-beta.22416.1</MicrosoftDotNetApiCompatVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22416.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>7.0.0-beta.22416.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22416.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22416.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22416.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22416.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22416.1</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22416.1</MicrosoftDotNetPackageTestingVersion>
 <MicrosoftDotNetApiCompatVersion>7.0.0-beta.22418.4</MicrosoftDotNetApiCompatVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22418.4</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>7.0.0-beta.22418.4</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22418.4</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22418.4</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22418.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22418.4</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22418.4</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22418.4</MicrosoftDotNetPackageTestingVersion>
 <!-- NuGet dependencies -->
 <NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
 <!-- Installer dependencies -->
Expand Down

37 changes: 37 additions & 0 deletions
eng/common/sdl/sdl.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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
}

37 changes: 17 additions & 20 deletions
eng/common/templates/steps/execute-sdl.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 }}
Expand All@@ -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 }}
Expand Down

39 changes: 2 additions & 37 deletions
eng/testing/tests.singlefile.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,48 +26,13 @@
 <IlcBuildTasksPath>$(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
 <IlcSdkPath>$(CoreCLRAotSdkDir)</IlcSdkPath>
 <IlcFrameworkPath>$(NetCoreAppCurrentTestHostSharedFrameworkPath)</IlcFrameworkPath>
 <NoWarn>$(NoWarn);IL3050;IL3051;IL3052;IL3054;IL3055;IL1005;IL3002</NoWarn>
 <NoWarn>$(NoWarn);IL1005;IL3002</NoWarn>
 <TrimMode>partial</TrimMode>
 <TrimmerSingleWarn>false</TrimmerSingleWarn>
 <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
 <SuppressAotAnalysisWarnings>true</SuppressAotAnalysisWarnings>

 <!-- Forced by ILLink targets; we should fix the SDK -->
 <SelfContained>true</SelfContained>

 <!-- Works around https://github.com/dotnet/runtime/issues/73926 -->
 <!-- RequiresUnreferenceCodeAttribute method called -->
 <NoWarn>$(NoWarn);IL2026;IL2116</NoWarn>
 <!-- Invalid use of DynamicallyAccessedMembersAttribute -->
 <NoWarn>$(NoWarn);IL2041;IL2042;IL2043;IL2056</NoWarn>
 <!-- Reference to removed attribute type -->
 <NoWarn>$(NoWarn);IL2045</NoWarn>
 <!-- RequiresUnreferencedCodeAttribute mismatch on virtual override -->
 <NoWarn>$(NoWarn);IL2046</NoWarn>
 <!-- COM marshalling warning -->
 <NoWarn>$(NoWarn);IL2050</NoWarn>
 <!-- Reflection intrinsics with unknown arguments -->
 <NoWarn>$(NoWarn);IL2032;IL2055;IL2057;IL2058;IL2059;IL2060;IL2061;IL2096</NoWarn>
 <!-- Unknown values passed to locations with DynamicallyAccessedMemberTypes -->
 <NoWarn>$(NoWarn);IL2062;IL2063;IL2064;IL2065;IL2066</NoWarn>
 <!-- Unsatisfied DynamicallyAccessedMembers requirements -->
 <NoWarn>$(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>
 <!-- DynamicallyAccessedMembersAttribute mismatch on virtual override -->
 <NoWarn>$(NoWarn);IL2092;IL2093;IL2094;IL2095</NoWarn>
 <!-- DynamicallyAccessedMembersAttribute used on unsupported member -->
 <NoWarn>$(NoWarn);IL2097;IL2098;IL2099;IL2106</NoWarn>
 <!-- Unknown value passed to Expression.Property -->
 <NoWarn>$(NoWarn);IL2103</NoWarn>
 <!-- Multiple methods associated with state machine type or user method -->
 <NoWarn>$(NoWarn);IL2107;IL2117</NoWarn>
 <!-- Unannotated type derived from base type with RequiresUnreferencedCode -->
 <NoWarn>$(NoWarn);IL2109</NoWarn>
 <!-- Reflection access to members with DynamicallyAccessedMembers requirements -->
 <NoWarn>$(NoWarn);IL2110;IL2111;IL2114;IL2115</NoWarn>
 <!-- Reflection access to members with RequiresUnreferencedCode -->
 <NoWarn>$(NoWarn);IL2112;IL2113</NoWarn>
 <!-- Reflection access to compiler-generated code -->
 <NoWarn>$(NoWarn);IL2118;IL2119;IL2120</NoWarn>

 </PropertyGroup>

 <Import Project="$(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.SingleEntry.targets" Condition="'$(TestNativeAot)' == 'true'" />
Expand Down

6 changes: 3 additions & 3 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,9 @@
 "dotnet": "7.0.100-preview.7.22377.5"
 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22416.1",
 "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22416.1",
 "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22416.1",
 "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22418.4",
 "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22418.4",
 "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22418.4",
 "Microsoft.Build.NoTargets": "3.5.0",
 "Microsoft.Build.Traversal": "3.1.6",
 "Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6"
Expand Down

1 change: 1 addition & 0 deletions
src/coreclr/dlls/mscorrc/mscorrc.rc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -271,6 +271,7 @@ BEGIN
 IDS_EE_BADMARSHAL_ABSTRACTRETCRITICALHANDLE "Returned CriticalHandles cannot be abstract."
 IDS_EE_BADMARSHAL_CUSTOMMARSHALER "Custom marshalers are only allowed on classes, strings, arrays, and boxed value types."
 IDS_EE_BADMARSHAL_GENERICS_RESTRICTION "Non-blittable generic types cannot be marshaled."
 IDS_EE_BADMARSHAL_INT128_RESTRICTION "System.Int128 and System.UInt128 cannot be passed by value to unmanaged."
 IDS_EE_BADMARSHAL_AUTOLAYOUT "Structures marked with [StructLayout(LayoutKind.Auto)] cannot be marshaled."
 IDS_EE_BADMARSHAL_STRING_OUT "Cannot marshal a string by-value with the [Out] attribute."
 IDS_EE_BADMARSHAL_MARSHAL_DISABLED "Cannot marshal managed types when the runtime marshalling system is disabled."
Expand Down

1 change: 1 addition & 0 deletions
src/coreclr/dlls/mscorrc/resource.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -283,6 +283,7 @@
#define IDS_EE_BADMARSHAL_ABSTRACTOUTCRITICALHANDLE 0x1a63
#define IDS_EE_BADMARSHAL_RETURNCHCOMTONATIVE 0x1a64
#define IDS_EE_BADMARSHAL_CRITICALHANDLE 0x1a65
#define IDS_EE_BADMARSHAL_INT128_RESTRICTION 0x1a66

#define IDS_EE_BADMARSHAL_ABSTRACTRETCRITICALHANDLE 0x1a6a
#define IDS_EE_CH_IN_VARIANT_NOT_SUPPORTED 0x1a6b
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[automated] Merge branch 'release/7.0-rc1' => 'release/7.0' by dotnet-maestro-bot · Pull Request #74205 · dotnet/runtime · GitHub
Skip to content
[automated] Merge branch 'release/7.0-rc1' => 'release/7.0'#74205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ViktorHofer
merged 8 commits into

from

Aug 20, 2022
 Merged


[automated] Merge branch 'release/7.0-rc1' => 'release/7.0'
#74205
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
f908dbc

[Ppc64le] bug fixes (#74131)


alhad-deshpande Aug 19, 2022
195178b

Improve ControlledExecution tests (#74186)


github-actions[bot] Aug 19, 2022
1af9cfd

Shorten the workload name even more (#74176)


github-actions[bot] Aug 19, 2022
d9c1700

[release/7.0-rc1] Disable Int128 use in by value ABI scenarios, and f…


github-actions[bot] Aug 20, 2022
39d767a

Don't NativeAOT crossgen on ARM64 (#74221)


github-actions[bot] Aug 20, 2022
c7cab43

[release/7.0-rc1] Add a way to suppress all trimming warnings (#74220)


github-actions[bot] Aug 20, 2022
37193fd

Don't track current field of state machines (#74216)


github-actions[bot] Aug 20, 2022
3c73d4d

[release/7.0] Update arcade to 7.0.0-beta.22418.4 (#74210)


hoyosjs Aug 20, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


76 changes: 38 additions & 38 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,77 +54,77 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22409.1">
 <Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -250,9 +250,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>5ebf69650b9f7b4ecab485be840b3022420f7812</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

32 changes: 16 additions & 16 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,22 +54,22 @@
 <!-- SDK dependencies -->
 <MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetApiCompatVersion>7.0.0-beta.22416.1</MicrosoftDotNetApiCompatVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22416.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>7.0.0-beta.22416.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22416.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22416.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22416.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22416.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22416.1</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22416.1</MicrosoftDotNetPackageTestingVersion>
 <MicrosoftDotNetApiCompatVersion>7.0.0-beta.22418.4</MicrosoftDotNetApiCompatVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22418.4</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>7.0.0-beta.22418.4</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22418.4</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22418.4</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22418.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22418.4</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22418.4</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22418.4</MicrosoftDotNetPackageTestingVersion>
 <!-- NuGet dependencies -->
 <NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
 <!-- Installer dependencies -->
Expand Down

37 changes: 37 additions & 0 deletions
eng/common/sdl/sdl.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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
}

37 changes: 17 additions & 20 deletions
eng/common/templates/steps/execute-sdl.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 }}
Expand All@@ -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 }}
Expand Down

39 changes: 2 additions & 37 deletions
eng/testing/tests.singlefile.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,48 +26,13 @@
 <IlcBuildTasksPath>$(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
 <IlcSdkPath>$(CoreCLRAotSdkDir)</IlcSdkPath>
 <IlcFrameworkPath>$(NetCoreAppCurrentTestHostSharedFrameworkPath)</IlcFrameworkPath>
 <NoWarn>$(NoWarn);IL3050;IL3051;IL3052;IL3054;IL3055;IL1005;IL3002</NoWarn>
 <NoWarn>$(NoWarn);IL1005;IL3002</NoWarn>
 <TrimMode>partial</TrimMode>
 <TrimmerSingleWarn>false</TrimmerSingleWarn>
 <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
 <SuppressAotAnalysisWarnings>true</SuppressAotAnalysisWarnings>

 <!-- Forced by ILLink targets; we should fix the SDK -->
 <SelfContained>true</SelfContained>

 <!-- Works around https://github.com/dotnet/runtime/issues/73926 -->
 <!-- RequiresUnreferenceCodeAttribute method called -->
 <NoWarn>$(NoWarn);IL2026;IL2116</NoWarn>
 <!-- Invalid use of DynamicallyAccessedMembersAttribute -->
 <NoWarn>$(NoWarn);IL2041;IL2042;IL2043;IL2056</NoWarn>
 <!-- Reference to removed attribute type -->
 <NoWarn>$(NoWarn);IL2045</NoWarn>
 <!-- RequiresUnreferencedCodeAttribute mismatch on virtual override -->
 <NoWarn>$(NoWarn);IL2046</NoWarn>
 <!-- COM marshalling warning -->
 <NoWarn>$(NoWarn);IL2050</NoWarn>
 <!-- Reflection intrinsics with unknown arguments -->
 <NoWarn>$(NoWarn);IL2032;IL2055;IL2057;IL2058;IL2059;IL2060;IL2061;IL2096</NoWarn>
 <!-- Unknown values passed to locations with DynamicallyAccessedMemberTypes -->
 <NoWarn>$(NoWarn);IL2062;IL2063;IL2064;IL2065;IL2066</NoWarn>
 <!-- Unsatisfied DynamicallyAccessedMembers requirements -->
 <NoWarn>$(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>
 <!-- DynamicallyAccessedMembersAttribute mismatch on virtual override -->
 <NoWarn>$(NoWarn);IL2092;IL2093;IL2094;IL2095</NoWarn>
 <!-- DynamicallyAccessedMembersAttribute used on unsupported member -->
 <NoWarn>$(NoWarn);IL2097;IL2098;IL2099;IL2106</NoWarn>
 <!-- Unknown value passed to Expression.Property -->
 <NoWarn>$(NoWarn);IL2103</NoWarn>
 <!-- Multiple methods associated with state machine type or user method -->
 <NoWarn>$(NoWarn);IL2107;IL2117</NoWarn>
 <!-- Unannotated type derived from base type with RequiresUnreferencedCode -->
 <NoWarn>$(NoWarn);IL2109</NoWarn>
 <!-- Reflection access to members with DynamicallyAccessedMembers requirements -->
 <NoWarn>$(NoWarn);IL2110;IL2111;IL2114;IL2115</NoWarn>
 <!-- Reflection access to members with RequiresUnreferencedCode -->
 <NoWarn>$(NoWarn);IL2112;IL2113</NoWarn>
 <!-- Reflection access to compiler-generated code -->
 <NoWarn>$(NoWarn);IL2118;IL2119;IL2120</NoWarn>

 </PropertyGroup>

 <Import Project="$(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.SingleEntry.targets" Condition="'$(TestNativeAot)' == 'true'" />
Expand Down

6 changes: 3 additions & 3 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,9 @@
 "dotnet": "7.0.100-preview.7.22377.5"
 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22416.1",
 "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22416.1",
 "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22416.1",
 "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22418.4",
 "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22418.4",
 "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22418.4",
 "Microsoft.Build.NoTargets": "3.5.0",
 "Microsoft.Build.Traversal": "3.1.6",
 "Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6"
Expand Down

1 change: 1 addition & 0 deletions
src/coreclr/dlls/mscorrc/mscorrc.rc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -271,6 +271,7 @@ BEGIN
 IDS_EE_BADMARSHAL_ABSTRACTRETCRITICALHANDLE "Returned CriticalHandles cannot be abstract."
 IDS_EE_BADMARSHAL_CUSTOMMARSHALER "Custom marshalers are only allowed on classes, strings, arrays, and boxed value types."
 IDS_EE_BADMARSHAL_GENERICS_RESTRICTION "Non-blittable generic types cannot be marshaled."
 IDS_EE_BADMARSHAL_INT128_RESTRICTION "System.Int128 and System.UInt128 cannot be passed by value to unmanaged."
 IDS_EE_BADMARSHAL_AUTOLAYOUT "Structures marked with [StructLayout(LayoutKind.Auto)] cannot be marshaled."
 IDS_EE_BADMARSHAL_STRING_OUT "Cannot marshal a string by-value with the [Out] attribute."
 IDS_EE_BADMARSHAL_MARSHAL_DISABLED "Cannot marshal managed types when the runtime marshalling system is disabled."
Expand Down

1 change: 1 addition & 0 deletions
src/coreclr/dlls/mscorrc/resource.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -283,6 +283,7 @@
#define IDS_EE_BADMARSHAL_ABSTRACTOUTCRITICALHANDLE 0x1a63
#define IDS_EE_BADMARSHAL_RETURNCHCOMTONATIVE 0x1a64
#define IDS_EE_BADMARSHAL_CRITICALHANDLE 0x1a65
#define IDS_EE_BADMARSHAL_INT128_RESTRICTION 0x1a66

#define IDS_EE_BADMARSHAL_ABSTRACTRETCRITICALHANDLE 0x1a6a
#define IDS_EE_CH_IN_VARIANT_NOT_SUPPORTED 0x1a6b
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
[automated] Merge branch 'release/7.0-rc1' => 'release/7.0' by dotnet-maestro-bot · Pull Request #74205 · dotnet/runtime · GitHub
Skip to content
[automated] Merge branch 'release/7.0-rc1' => 'release/7.0'#74205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

ViktorHofer
merged 8 commits into

from

Aug 20, 2022
 Merged


[automated] Merge branch 'release/7.0-rc1' => 'release/7.0'
#74205
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
f908dbc

[Ppc64le] bug fixes (#74131)


alhad-deshpande Aug 19, 2022
195178b

Improve ControlledExecution tests (#74186)


github-actions[bot] Aug 19, 2022
1af9cfd

Shorten the workload name even more (#74176)


github-actions[bot] Aug 19, 2022
d9c1700

[release/7.0-rc1] Disable Int128 use in by value ABI scenarios, and f…


github-actions[bot] Aug 20, 2022
39d767a

Don't NativeAOT crossgen on ARM64 (#74221)


github-actions[bot] Aug 20, 2022
c7cab43

[release/7.0-rc1] Add a way to suppress all trimming warnings (#74220)


github-actions[bot] Aug 20, 2022
37193fd

Don't track current field of state machines (#74216)


github-actions[bot] Aug 20, 2022
3c73d4d

[release/7.0] Update arcade to 7.0.0-beta.22418.4 (#74210)


hoyosjs Aug 20, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


76 changes: 38 additions & 38 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,77 +54,77 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22409.1">
 <Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -250,9 +250,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>5ebf69650b9f7b4ecab485be840b3022420f7812</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22416.1">
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22418.4">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
 <Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

32 changes: 16 additions & 16 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,22 +54,22 @@
 <!-- SDK dependencies -->
 <MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetApiCompatVersion>7.0.0-beta.22416.1</MicrosoftDotNetApiCompatVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22416.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>7.0.0-beta.22416.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22416.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22416.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22416.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22416.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22416.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22416.1</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22416.1</MicrosoftDotNetPackageTestingVersion>
 <MicrosoftDotNetApiCompatVersion>7.0.0-beta.22418.4</MicrosoftDotNetApiCompatVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22418.4</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>7.0.0-beta.22418.4</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22418.4</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22418.4</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22418.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22418.4</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22418.4</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22418.4</MicrosoftDotNetPackageTestingVersion>
 <!-- NuGet dependencies -->
 <NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
 <!-- Installer dependencies -->
Expand Down

37 changes: 37 additions & 0 deletions
eng/common/sdl/sdl.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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
}

37 changes: 17 additions & 20 deletions
eng/common/templates/steps/execute-sdl.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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 }}
Expand All@@ -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 }}
Expand Down

39 changes: 2 additions & 37 deletions
eng/testing/tests.singlefile.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,48 +26,13 @@
 <IlcBuildTasksPath>$(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
 <IlcSdkPath>$(CoreCLRAotSdkDir)</IlcSdkPath>
 <IlcFrameworkPath>$(NetCoreAppCurrentTestHostSharedFrameworkPath)</IlcFrameworkPath>
 <NoWarn>$(NoWarn);IL3050;IL3051;IL3052;IL3054;IL3055;IL1005;IL3002</NoWarn>
 <NoWarn>$(NoWarn);IL1005;IL3002</NoWarn>
 <TrimMode>partial</TrimMode>
 <TrimmerSingleWarn>false</TrimmerSingleWarn>
 <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
 <SuppressAotAnalysisWarnings>true</SuppressAotAnalysisWarnings>

 <!-- Forced by ILLink targets; we should fix the SDK -->
 <SelfContained>true</SelfContained>

 <!-- Works around https://github.com/dotnet/runtime/issues/73926 -->
 <!-- RequiresUnreferenceCodeAttribute method called -->
 <NoWarn>$(NoWarn);IL2026;IL2116</NoWarn>
 <!-- Invalid use of DynamicallyAccessedMembersAttribute -->
 <NoWarn>$(NoWarn);IL2041;IL2042;IL2043;IL2056</NoWarn>
 <!-- Reference to removed attribute type -->
 <NoWarn>$(NoWarn);IL2045</NoWarn>
 <!-- RequiresUnreferencedCodeAttribute mismatch on virtual override -->
 <NoWarn>$(NoWarn);IL2046</NoWarn>
 <!-- COM marshalling warning -->
 <NoWarn>$(NoWarn);IL2050</NoWarn>
 <!-- Reflection intrinsics with unknown arguments -->
 <NoWarn>$(NoWarn);IL2032;IL2055;IL2057;IL2058;IL2059;IL2060;IL2061;IL2096</NoWarn>
 <!-- Unknown values passed to locations with DynamicallyAccessedMemberTypes -->
 <NoWarn>$(NoWarn);IL2062;IL2063;IL2064;IL2065;IL2066</NoWarn>
 <!-- Unsatisfied DynamicallyAccessedMembers requirements -->
 <NoWarn>$(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>
 <!-- DynamicallyAccessedMembersAttribute mismatch on virtual override -->
 <NoWarn>$(NoWarn);IL2092;IL2093;IL2094;IL2095</NoWarn>
 <!-- DynamicallyAccessedMembersAttribute used on unsupported member -->
 <NoWarn>$(NoWarn);IL2097;IL2098;IL2099;IL2106</NoWarn>
 <!-- Unknown value passed to Expression.Property -->
 <NoWarn>$(NoWarn);IL2103</NoWarn>
 <!-- Multiple methods associated with state machine type or user method -->
 <NoWarn>$(NoWarn);IL2107;IL2117</NoWarn>
 <!-- Unannotated type derived from base type with RequiresUnreferencedCode -->
 <NoWarn>$(NoWarn);IL2109</NoWarn>
 <!-- Reflection access to members with DynamicallyAccessedMembers requirements -->
 <NoWarn>$(NoWarn);IL2110;IL2111;IL2114;IL2115</NoWarn>
 <!-- Reflection access to members with RequiresUnreferencedCode -->
 <NoWarn>$(NoWarn);IL2112;IL2113</NoWarn>
 <!-- Reflection access to compiler-generated code -->
 <NoWarn>$(NoWarn);IL2118;IL2119;IL2120</NoWarn>

 </PropertyGroup>

 <Import Project="$(CoreCLRBuildIntegrationDir)Microsoft.DotNet.ILCompiler.SingleEntry.targets" Condition="'$(TestNativeAot)' == 'true'" />
Expand Down

6 changes: 3 additions & 3 deletions
global.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,9 +8,9 @@
 "dotnet": "7.0.100-preview.7.22377.5"
 },
 "msbuild-sdks": {
 "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22416.1",
 "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22416.1",
 "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22416.1",
 "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22418.4",
 "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22418.4",
 "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22418.4",
 "Microsoft.Build.NoTargets": "3.5.0",
 "Microsoft.Build.Traversal": "3.1.6",
 "Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6"
Expand Down

1 change: 1 addition & 0 deletions
src/coreclr/dlls/mscorrc/mscorrc.rc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -271,6 +271,7 @@ BEGIN
 IDS_EE_BADMARSHAL_ABSTRACTRETCRITICALHANDLE "Returned CriticalHandles cannot be abstract."
 IDS_EE_BADMARSHAL_CUSTOMMARSHALER "Custom marshalers are only allowed on classes, strings, arrays, and boxed value types."
 IDS_EE_BADMARSHAL_GENERICS_RESTRICTION "Non-blittable generic types cannot be marshaled."
 IDS_EE_BADMARSHAL_INT128_RESTRICTION "System.Int128 and System.UInt128 cannot be passed by value to unmanaged."
 IDS_EE_BADMARSHAL_AUTOLAYOUT "Structures marked with [StructLayout(LayoutKind.Auto)] cannot be marshaled."
 IDS_EE_BADMARSHAL_STRING_OUT "Cannot marshal a string by-value with the [Out] attribute."
 IDS_EE_BADMARSHAL_MARSHAL_DISABLED "Cannot marshal managed types when the runtime marshalling system is disabled."
Expand Down

1 change: 1 addition & 0 deletions
src/coreclr/dlls/mscorrc/resource.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -283,6 +283,7 @@
#define IDS_EE_BADMARSHAL_ABSTRACTOUTCRITICALHANDLE 0x1a63
#define IDS_EE_BADMARSHAL_RETURNCHCOMTONATIVE 0x1a64
#define IDS_EE_BADMARSHAL_CRITICALHANDLE 0x1a65
#define IDS_EE_BADMARSHAL_INT128_RESTRICTION 0x1a66

#define IDS_EE_BADMARSHAL_ABSTRACTRETCRITICALHANDLE 0x1a6a
#define IDS_EE_CH_IN_VARIANT_NOT_SUPPORTED 0x1a6b
Expand Down
Loading