diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0fda58c0fac..6b80b73b0f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,87 +10,87 @@ --> - + https://github.com/dotnet/corefx - a6c1d1ac235aba5bf17dd06228a62509192cda6a + ba8156d2f0d206655caf0713f6bed0265f48f098 - + https://github.com/dotnet/corefx - a6c1d1ac235aba5bf17dd06228a62509192cda6a + ba8156d2f0d206655caf0713f6bed0265f48f098 - + https://github.com/dotnet/corefx - a6c1d1ac235aba5bf17dd06228a62509192cda6a + ba8156d2f0d206655caf0713f6bed0265f48f098 - + https://github.com/dotnet/corefx - a6c1d1ac235aba5bf17dd06228a62509192cda6a + ba8156d2f0d206655caf0713f6bed0265f48f098 - + https://github.com/dotnet/corefx - a6c1d1ac235aba5bf17dd06228a62509192cda6a + ba8156d2f0d206655caf0713f6bed0265f48f098 - + https://github.com/dotnet/corefx - a6c1d1ac235aba5bf17dd06228a62509192cda6a + ba8156d2f0d206655caf0713f6bed0265f48f098 - + https://github.com/dotnet/corefx - a6c1d1ac235aba5bf17dd06228a62509192cda6a + ba8156d2f0d206655caf0713f6bed0265f48f098 - + https://github.com/dotnet/corefx - a6c1d1ac235aba5bf17dd06228a62509192cda6a + ba8156d2f0d206655caf0713f6bed0265f48f098 - + https://github.com/dotnet/corefx - a6c1d1ac235aba5bf17dd06228a62509192cda6a + ba8156d2f0d206655caf0713f6bed0265f48f098 - + https://github.com/dotnet/corefx - a6c1d1ac235aba5bf17dd06228a62509192cda6a + ba8156d2f0d206655caf0713f6bed0265f48f098 - + https://github.com/dotnet/corefx - a6c1d1ac235aba5bf17dd06228a62509192cda6a + ba8156d2f0d206655caf0713f6bed0265f48f098 - + https://github.com/dotnet/corefx - a6c1d1ac235aba5bf17dd06228a62509192cda6a + ba8156d2f0d206655caf0713f6bed0265f48f098 - + https://github.com/dotnet/core-setup - 62a9f1bdf39ba0b719875d33e248408d3802e925 + 52c5ab896d148be85bb7be1656270092c3979790 - + https://github.com/dotnet/core-setup - 62a9f1bdf39ba0b719875d33e248408d3802e925 + 52c5ab896d148be85bb7be1656270092c3979790 - + https://github.com/dotnet/core-setup - 62a9f1bdf39ba0b719875d33e248408d3802e925 + 52c5ab896d148be85bb7be1656270092c3979790 - + https://github.com/dotnet/arcade - b1c2f33f0cef32d1df6e7f388017fd6761d3fcad + 82c822ee7db08f5347e6ac44e3ed465248394a9e - + https://github.com/dotnet/arcade - b1c2f33f0cef32d1df6e7f388017fd6761d3fcad + 82c822ee7db08f5347e6ac44e3ed465248394a9e - + https://github.com/dotnet/arcade - b1c2f33f0cef32d1df6e7f388017fd6761d3fcad + 82c822ee7db08f5347e6ac44e3ed465248394a9e - + https://github.com/dotnet/corefx - a6c1d1ac235aba5bf17dd06228a62509192cda6a + ba8156d2f0d206655caf0713f6bed0265f48f098 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index d4dba985314..ea560b949d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,26 +42,26 @@ --> - 5.0.0-alpha1.19404.5 - 5.0.0-alpha1.19404.5 - 2.1.0-alpha1.19404.5 + 5.0.0-alpha1.19411.12 + 5.0.0-alpha1.19411.12 + 2.1.0-alpha1.19411.12 - 5.0.0-alpha1.19381.2 - 5.0.0-alpha1.19381.2 - 5.0.0-alpha1.19381.2 - 5.0.0-alpha1.19381.2 - 5.0.0-alpha1.19381.2 - 1.8.0-alpha1.19381.2 - 5.0.0-alpha1.19381.2 - 5.0.0-alpha1.19381.2 - 5.0.0-alpha1.19381.2 - 5.0.0-alpha1.19381.2 - 5.0.0-alpha1.19381.2 - 5.0.0-alpha1.19381.2 + 5.0.0-alpha1.19409.9 + 5.0.0-alpha1.19409.9 + 5.0.0-alpha1.19409.9 + 5.0.0-alpha1.19409.9 + 5.0.0-alpha1.19409.9 + 1.8.0-alpha1.19409.9 + 5.0.0-alpha1.19409.9 + 5.0.0-alpha1.19409.9 + 5.0.0-alpha1.19409.9 + 5.0.0-alpha1.19409.9 + 5.0.0-alpha1.19409.9 + 5.0.0-alpha1.19409.9 - 5.0.0-alpha1.19381.2 + 5.0.0-alpha1.19409.9 - 1.0.0-beta.19404.1 + 1.0.0-beta.19412.7 3.3.0-beta3-19407-05 diff --git a/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1 index 7e5441f7974..ac05256bfd2 100644 --- a/eng/common/performance/performance-setup.ps1 +++ b/eng/common/performance/performance-setup.ps1 @@ -33,7 +33,7 @@ if ($Framework.StartsWith("netcoreapp")) { } if ($Internal) { - $Queue = "Windows.10.Amd64.ClientRS5.Perf" + $Queue = "Windows.10.Amd64.19H1.Tiger.Perf" $PerfLabArguments = "--upload-to-perflab-container" $ExtraBenchmarkDotNetArguments = "" $Creator = "" diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh index 126da5f76d4..dc6fd218717 100755 --- a/eng/common/performance/performance-setup.sh +++ b/eng/common/performance/performance-setup.sh @@ -132,7 +132,7 @@ if [[ "$internal" == true ]]; then if [[ "$architecture" = "arm64" ]]; then queue=Ubuntu.1804.Arm64.Perf else - queue=Ubuntu.1804.Amd64.Perf + queue=Ubuntu.1804.Amd64.Tiger.Perf fi fi @@ -157,20 +157,20 @@ if [[ "$use_core_run" = true ]]; then fi # Make sure all of our variables are available for future steps -echo "##vso[task.setvariable variable=UseCoreRun]$use_core_run" -echo "##vso[task.setvariable variable=Architecture]$architecture" -echo "##vso[task.setvariable variable=PayloadDirectory]$payload_directory" -echo "##vso[task.setvariable variable=PerformanceDirectory]$performance_directory" -echo "##vso[task.setvariable variable=WorkItemDirectory]$workitem_directory" -echo "##vso[task.setvariable variable=Queue]$queue" -echo "##vso[task.setvariable variable=SetupArguments]$setup_arguments" -echo "##vso[task.setvariable variable=Python]python3" -echo "##vso[task.setvariable variable=PerfLabArguments]$perflab_arguments" -echo "##vso[task.setvariable variable=ExtraBenchmarkDotNetArguments]$extra_benchmark_dotnet_arguments" -echo "##vso[task.setvariable variable=BDNCategories]$run_categories" -echo "##vso[task.setvariable variable=TargetCsproj]$csproj" -echo "##vso[task.setvariable variable=RunFromPerfRepo]$run_from_perf_repo" -echo "##vso[task.setvariable variable=Creator]$creator" -echo "##vso[task.setvariable variable=HelixSourcePrefix]$helix_source_prefix" -echo "##vso[task.setvariable variable=Kind]$kind" -echo "##vso[task.setvariable variable=_BuildConfig]$architecture.$kind.$framework" \ No newline at end of file +Write-PipelineSetVariable -name "UseCoreRun" -value "$use_core_run" -is_multi_job_variable false +Write-PipelineSetVariable -name "Architecture" -value "$architecture" -is_multi_job_variable false +Write-PipelineSetVariable -name "PayloadDirectory" -value "$payload_directory" -is_multi_job_variable false +Write-PipelineSetVariable -name "PerformanceDirectory" -value "$performance_directory" -is_multi_job_variable false +Write-PipelineSetVariable -name "WorkItemDirectory" -value "$workitem_directory" -is_multi_job_variable false +Write-PipelineSetVariable -name "Queue" -value "$queue" -is_multi_job_variable false +Write-PipelineSetVariable -name "SetupArguments" -value "$setup_arguments" -is_multi_job_variable false +Write-PipelineSetVariable -name "Python" -value "$python3" -is_multi_job_variable false +Write-PipelineSetVariable -name "PerfLabArguments" -value "$perflab_arguments" -is_multi_job_variable false +Write-PipelineSetVariable -name "ExtraBenchmarkDotNetArguments" -value "$extra_benchmark_dotnet_arguments" -is_multi_job_variable false +Write-PipelineSetVariable -name "BDNCategories" -value "$run_categories" -is_multi_job_variable false +Write-PipelineSetVariable -name "TargetCsproj" -value "$csproj" -is_multi_job_variable false +Write-PipelineSetVariable -name "RunFromPerfRepo" -value "$run_from_perf_repo" -is_multi_job_variable false +Write-PipelineSetVariable -name "Creator" -value "$creator" -is_multi_job_variable false +Write-PipelineSetVariable -name "HelixSourcePrefix" -value "$helix_source_prefix" -is_multi_job_variable false +Write-PipelineSetVariable -name "Kind" -value "$kind" -is_multi_job_variable false +Write-PipelineSetVariable -name "_BuildConfig" -value "$architecture.$kind.$framework" -is_multi_job_variable false \ No newline at end of file diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index f657a4dc91d..91621cf88fd 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -10,6 +10,8 @@ jobs: displayName: Run SDL tool variables: - group: DotNet-VSTS-Bot + pool: + name: Hosted VS2017 steps: - checkout: self clean: true diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 33db50ce261..aba0b0fcafb 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -52,6 +52,7 @@ stages: filePath: eng\common\sdk-task.ps1 arguments: -task SigningValidation -restore -msbuildEngine dotnet /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' + /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' /p:Configuration=Release - ${{ if eq(parameters.enableSourceLinkValidation, 'true') }}: diff --git a/global.json b/global.json index bf455da232c..b31c54da2f8 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19404.1", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19404.1" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19412.7", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19412.7" } } diff --git a/src/DependencyInjection/DI.Abstractions/src/ServiceDescriptor.cs b/src/DependencyInjection/DI.Abstractions/src/ServiceDescriptor.cs index 1544f06bcc2..805bfe03779 100644 --- a/src/DependencyInjection/DI.Abstractions/src/ServiceDescriptor.cs +++ b/src/DependencyInjection/DI.Abstractions/src/ServiceDescriptor.cs @@ -452,7 +452,7 @@ public static ServiceDescriptor Singleton( /// /// Creates an instance of with the specified /// , , - /// and the lifetime. + /// and the lifetime. /// /// The type of the service. /// The instance of the implementation. @@ -471,7 +471,7 @@ public static ServiceDescriptor Singleton(TService implementationInsta /// /// Creates an instance of with the specified /// , , - /// and the lifetime. + /// and the lifetime. /// /// The type of the service. /// The instance of the implementation. diff --git a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj index 3c995639493..a2ebaa88964 100644 --- a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj +++ b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj @@ -26,7 +26,7 @@ - + diff --git a/src/HttpClientFactory/Http/src/DependencyInjection/HttpClientFactoryServiceCollectionExtensions.cs b/src/HttpClientFactory/Http/src/DependencyInjection/HttpClientFactoryServiceCollectionExtensions.cs index edf1d08b907..3d37990288f 100644 --- a/src/HttpClientFactory/Http/src/DependencyInjection/HttpClientFactoryServiceCollectionExtensions.cs +++ b/src/HttpClientFactory/Http/src/DependencyInjection/HttpClientFactoryServiceCollectionExtensions.cs @@ -179,7 +179,7 @@ public static IHttpClientBuilder AddHttpClient(this IServiceCollection services, /// /// Adds the and related services to the and configures /// a binding between the type and a named . The client name - /// will be set to the full name of . + /// will be set to the type name of . /// /// /// The type of the typed client. They type specified will be registered in the service collection as diff --git a/src/Logging/Logging.EventSource/test/EventSourceLoggerTest.cs b/src/Logging/Logging.EventSource/test/EventSourceLoggerTest.cs index ca0afd73e60..3bc88a7b49e 100644 --- a/src/Logging/Logging.EventSource/test/EventSourceLoggerTest.cs +++ b/src/Logging/Logging.EventSource/test/EventSourceLoggerTest.cs @@ -704,7 +704,7 @@ private static class EventTypes #else { "E5JS", (e) => VerifySingleEvent(e, "Logger2", EventTypes.MessageJson, 5, null, LogLevel.Critical, @"""ArgumentsJson"":{""stringParam"":""bar"",""int1Param"":""23"",""int2Param"":""45""", - @"""ExceptionJson"":{""TypeName"":""System.Exception"",""Message"":""oops"",""HResult"":""-2146233088"",""VerboseMessage"":""System.Exception: oops ---\u003e System.Exception: inner oops") }, + @"""ExceptionJson"":{""TypeName"":""System.Exception"",""Message"":""oops"",""HResult"":""-2146233088"",""VerboseMessage"":""System.Exception: oops ---\u003E System.Exception: inner oops") }, { "E5MSG", (e) => VerifySingleEvent(e, "Logger2", EventTypes.Message, 5, null, LogLevel.Critical, @"{""Key"":""stringParam"",""Value"":""bar""}", diff --git a/src/Options/Options/ref/Microsoft.Extensions.Options.netcoreapp5.0.cs b/src/Options/Options/ref/Microsoft.Extensions.Options.netcoreapp5.0.cs index 11afa1d3423..35bceec0ca6 100644 --- a/src/Options/Options/ref/Microsoft.Extensions.Options.netcoreapp5.0.cs +++ b/src/Options/Options/ref/Microsoft.Extensions.Options.netcoreapp5.0.cs @@ -103,7 +103,7 @@ public partial interface IOptionsChangeTokenSource string Name { get; } Microsoft.Extensions.Primitives.IChangeToken GetChangeToken(); } - public partial interface IOptionsFactory where TOptions : class, new() + public partial interface IOptionsFactory where TOptions : class { TOptions Create(string name); } @@ -120,11 +120,11 @@ public partial interface IOptionsMonitor TOptions Get(string name); System.IDisposable OnChange(System.Action listener); } - public partial interface IOptionsSnapshot : Microsoft.Extensions.Options.IOptions where TOptions : class, new() + public partial interface IOptionsSnapshot : Microsoft.Extensions.Options.IOptions where TOptions : class { TOptions Get(string name); } - public partial interface IOptions where TOptions : class, new() + public partial interface IOptions where TOptions : class { TOptions Value { get; } } @@ -139,7 +139,7 @@ public partial interface IValidateOptions where TOptions : class public static partial class Options { public static readonly string DefaultName; - public static Microsoft.Extensions.Options.IOptions Create(TOptions options) where TOptions : class, new() { throw null; } + public static Microsoft.Extensions.Options.IOptions Create(TOptions options) where TOptions : class { throw null; } } public partial class OptionsBuilder where TOptions : class { @@ -179,13 +179,14 @@ public void Clear() { } public virtual bool TryAdd(string name, TOptions options) { throw null; } public virtual bool TryRemove(string name) { throw null; } } - public partial class OptionsFactory : Microsoft.Extensions.Options.IOptionsFactory where TOptions : class, new() + public partial class OptionsFactory : Microsoft.Extensions.Options.IOptionsFactory where TOptions : class { public OptionsFactory(System.Collections.Generic.IEnumerable> setups, System.Collections.Generic.IEnumerable> postConfigures) { } public OptionsFactory(System.Collections.Generic.IEnumerable> setups, System.Collections.Generic.IEnumerable> postConfigures, System.Collections.Generic.IEnumerable> validations) { } public TOptions Create(string name) { throw null; } + protected virtual TOptions CreateInstance(string name) { throw null; } } - public partial class OptionsManager : Microsoft.Extensions.Options.IOptions, Microsoft.Extensions.Options.IOptionsSnapshot where TOptions : class, new() + public partial class OptionsManager : Microsoft.Extensions.Options.IOptions, Microsoft.Extensions.Options.IOptionsSnapshot where TOptions : class { public OptionsManager(Microsoft.Extensions.Options.IOptionsFactory factory) { } public TOptions Value { get { throw null; } } @@ -195,7 +196,7 @@ public static partial class OptionsMonitorExtensions { public static System.IDisposable OnChange(this Microsoft.Extensions.Options.IOptionsMonitor monitor, System.Action listener) { throw null; } } - public partial class OptionsMonitor : Microsoft.Extensions.Options.IOptionsMonitor, System.IDisposable where TOptions : class, new() + public partial class OptionsMonitor : Microsoft.Extensions.Options.IOptionsMonitor, System.IDisposable where TOptions : class { public OptionsMonitor(Microsoft.Extensions.Options.IOptionsFactory factory, System.Collections.Generic.IEnumerable> sources, Microsoft.Extensions.Options.IOptionsMonitorCache cache) { } public TOptions CurrentValue { get { throw null; } } @@ -211,7 +212,7 @@ public OptionsValidationException(string optionsName, System.Type optionsType, S public string OptionsName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public System.Type OptionsType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } } - public partial class OptionsWrapper : Microsoft.Extensions.Options.IOptions where TOptions : class, new() + public partial class OptionsWrapper : Microsoft.Extensions.Options.IOptions where TOptions : class { public OptionsWrapper(TOptions options) { } public TOptions Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }