diff --git a/Directory.Packages.props b/Directory.Packages.props index 568b021b857d..f111c202f983 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -37,6 +37,7 @@ + diff --git a/eng/Publishing.props b/eng/Publishing.props index 2eb794f98bb4..802134fadee4 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -43,6 +43,10 @@ + + + + 7.0.0-preview.2.256 7.0.0-preview.2.256 - 2.1.0-preview.25553.3 - 4.1.0-preview.25553.3 + 2.1.0-preview.25561.13 + 4.1.0-preview.25561.13 + + $(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion) + $(MicrosoftBuildPackageVersion) + $(MicrosoftBuildLocalizationPackageVersion) + $(MicrosoftBuildNuGetSdkResolverPackageVersion) + $(MicrosoftCodeAnalysisPackageVersion) + $(MicrosoftCodeAnalysisBuildClientPackageVersion) + $(MicrosoftCodeAnalysisCSharpPackageVersion) + $(MicrosoftCodeAnalysisCSharpCodeStylePackageVersion) + $(MicrosoftCodeAnalysisCSharpFeaturesPackageVersion) + $(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion) + $(MicrosoftCodeAnalysisExternalAccessHotReloadPackageVersion) + $(MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion) + $(MicrosoftCodeAnalysisRazorToolingInternalPackageVersion) + $(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion) + $(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion) + $(MicrosoftDotNetArcadeSdkPackageVersion) + $(MicrosoftDotNetBuildTasksInstallersPackageVersion) + $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) + $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) + $(MicrosoftDotNetHelixSdkPackageVersion) + $(MicrosoftDotNetSignToolPackageVersion) + $(MicrosoftDotNetXliffTasksPackageVersion) + $(MicrosoftDotNetXUnitExtensionsPackageVersion) + $(MicrosoftFSharpCompilerPackageVersion) + $(MicrosoftNetCompilersToolsetPackageVersion) + $(MicrosoftNetCompilersToolsetFrameworkPackageVersion) + $(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion) + $(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion) + $(MicrosoftNETTestSdkPackageVersion) + $(MicrosoftTemplateEngineAbstractionsPackageVersion) + $(MicrosoftTemplateEngineAuthoringTemplateVerifierPackageVersion) + $(MicrosoftTemplateEngineEdgePackageVersion) + $(MicrosoftTemplateEngineMocksPackageVersion) + $(MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion) + $(MicrosoftTemplateEngineTestHelperPackageVersion) + $(MicrosoftTemplateEngineUtilsPackageVersion) + $(MicrosoftTemplateSearchCommonPackageVersion) + $(MicrosoftTemplateSearchTemplateDiscoveryPackageVersion) + $(MicrosoftTestPlatformBuildPackageVersion) + $(MicrosoftTestPlatformCLIPackageVersion) + $(NuGetBuildTasksPackageVersion) + $(NuGetBuildTasksConsolePackageVersion) + $(NuGetBuildTasksPackPackageVersion) + $(NuGetCommandLineXPlatPackageVersion) + $(NuGetCommandsPackageVersion) + $(NuGetCommonPackageVersion) + $(NuGetConfigurationPackageVersion) + $(NuGetCredentialsPackageVersion) + $(NuGetDependencyResolverCorePackageVersion) + $(NuGetFrameworksPackageVersion) + $(NuGetLibraryModelPackageVersion) + $(NuGetLocalizationPackageVersion) + $(NuGetPackagingPackageVersion) + $(NuGetProjectModelPackageVersion) + $(NuGetProtocolPackageVersion) + $(NuGetVersioningPackageVersion) $(dotnetdevcertsPackageVersion) $(dotnetuserjwtsPackageVersion) @@ -169,22 +226,11 @@ This file should be imported by eng/Versions.props $(MicrosoftAspNetCoreMetadataPackageVersion) $(MicrosoftAspNetCoreMvcAnalyzersPackageVersion) $(MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion) - $(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion) $(MicrosoftAspNetCoreTestHostPackageVersion) $(MicrosoftBclAsyncInterfacesPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildLocalizationPackageVersion) $(MicrosoftBuildTasksGitPackageVersion) - $(MicrosoftCodeAnalysisPackageVersion) - $(MicrosoftCodeAnalysisBuildClientPackageVersion) - $(MicrosoftCodeAnalysisCSharpPackageVersion) - $(MicrosoftCodeAnalysisCSharpCodeStylePackageVersion) - $(MicrosoftCodeAnalysisCSharpFeaturesPackageVersion) - $(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion) - $(MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion) - $(MicrosoftCodeAnalysisRazorToolingInternalPackageVersion) - $(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion) - $(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion) $(MicrosoftDeploymentDotNetReleasesPackageVersion) $(MicrosoftDiaSymReaderPackageVersion) $(MicrosoftDotNetWebItemTemplates100PackageVersion) @@ -198,16 +244,11 @@ This file should be imported by eng/Versions.props $(MicrosoftExtensionsLoggingAbstractionsPackageVersion) $(MicrosoftExtensionsLoggingConsolePackageVersion) $(MicrosoftExtensionsObjectPoolPackageVersion) - $(MicrosoftFSharpCompilerPackageVersion) $(MicrosoftJSInteropPackageVersion) - $(MicrosoftNetCompilersToolsetPackageVersion) - $(MicrosoftNetCompilersToolsetFrameworkPackageVersion) $(MicrosoftNETHostModelPackageVersion) $(MicrosoftNETILLinkTasksPackageVersion) $(MicrosoftNETRuntimeEmscripten3156Cachewinx64PackageVersion) - $(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion) $(MicrosoftNETSdkWindowsDesktopPackageVersion) - $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCorePlatformsPackageVersion) $(MicrosoftSourceLinkAzureReposGitPackageVersion) @@ -215,17 +256,6 @@ This file should be imported by eng/Versions.props $(MicrosoftSourceLinkCommonPackageVersion) $(MicrosoftSourceLinkGitHubPackageVersion) $(MicrosoftSourceLinkGitLabPackageVersion) - $(MicrosoftTemplateEngineAbstractionsPackageVersion) - $(MicrosoftTemplateEngineAuthoringTemplateVerifierPackageVersion) - $(MicrosoftTemplateEngineEdgePackageVersion) - $(MicrosoftTemplateEngineMocksPackageVersion) - $(MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion) - $(MicrosoftTemplateEngineTestHelperPackageVersion) - $(MicrosoftTemplateEngineUtilsPackageVersion) - $(MicrosoftTemplateSearchCommonPackageVersion) - $(MicrosoftTemplateSearchTemplateDiscoveryPackageVersion) - $(MicrosoftTestPlatformBuildPackageVersion) - $(MicrosoftTestPlatformCLIPackageVersion) $(MicrosoftWebXdtPackageVersion) $(MicrosoftWin32SystemEventsPackageVersion) $(MicrosoftWindowsDesktopAppInternalPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4a369e67ceb2..6d8c0a73f10c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -553,13 +553,13 @@ https://github.com/dotnet/dotnet be28ec777bf12db631725399c442448d52093087 - + https://github.com/microsoft/testfx - b2b75ecb52bcff592001df6d08f5fffccd945fdd + c60f4f766766774d2b45ff4f62abe3d9b269ebee - + https://github.com/microsoft/testfx - b2b75ecb52bcff592001df6d08f5fffccd945fdd + c60f4f766766774d2b45ff4f62abe3d9b269ebee https://github.com/dotnet/dotnet diff --git a/eng/Versions.props b/eng/Versions.props index 9cc9ebe8ba88..6e9169c48801 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -112,7 +112,7 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.14.8 + 17.14.28 18.0 @@ -126,7 +126,7 @@ - 1.8.1 + 1.10.2 4.0.1 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index fc8d618014e0..65ed3a8adef0 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -1,6 +1,7 @@ # This script adds internal feeds required to build commits that depend on internal package sources. For instance, -# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables -# disabled internal Maestro (darc-int*) feeds. +# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly, +# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present. +# In addition, this script also enables disabled internal Maestro (darc-int*) feeds. # # Optionally, this script also adds a credential entry for each of the internal feeds if supplied. # @@ -173,4 +174,16 @@ foreach ($dotnetVersion in $dotnetVersions) { } } +# Check for dotnet-eng and add dotnet-eng-internal if present +$dotnetEngSource = $sources.SelectSingleNode("add[@key='dotnet-eng']") +if ($dotnetEngSource -ne $null) { + AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-eng-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password +} + +# Check for dotnet-tools and add dotnet-tools-internal if present +$dotnetToolsSource = $sources.SelectSingleNode("add[@key='dotnet-tools']") +if ($dotnetToolsSource -ne $null) { + AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-tools-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password +} + $doc.Save($filename) diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index dd2564aef012..995eda67c6eb 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -1,8 +1,9 @@ #!/usr/bin/env bash # This script adds internal feeds required to build commits that depend on internal package sources. For instance, -# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables -# disabled internal Maestro (darc-int*) feeds. +# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly, +# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present. +# In addition, this script also enables disabled internal Maestro (darc-int*) feeds. # # Optionally, this script also adds a credential entry for each of the internal feeds if supplied. # @@ -175,6 +176,18 @@ for DotNetVersion in ${DotNetVersions[@]} ; do fi done +# Check for dotnet-eng and add dotnet-eng-internal if present +grep -i " /dev/null +if [ "$?" == "0" ]; then + AddOrEnablePackageSource "dotnet-eng-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$FeedSuffix" +fi + +# Check for dotnet-tools and add dotnet-tools-internal if present +grep -i " /dev/null +if [ "$?" == "0" ]; then + AddOrEnablePackageSource "dotnet-tools-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$FeedSuffix" +fi + # I want things split line by line PrevIFS=$IFS IFS=$'\n' diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 37dff559fc1b..e7daa6d2fafe 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -180,6 +180,11 @@ jobs: PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} is1ESPipeline: ${{ parameters.is1ESPipeline }} + # Darc is targeting 8.0, so make sure it's installed + - task: UseDotNet@2 + inputs: + version: 8.0.x + - task: AzureCLI@2 displayName: Publish Using Darc inputs: diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index f6f87fe5c675..55361908c2e9 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -307,6 +307,11 @@ stages: - task: NuGetAuthenticate@1 + # Darc is targeting 8.0, so make sure it's installed + - task: UseDotNet@2 + inputs: + version: 8.0.x + - task: AzureCLI@2 displayName: Publish Using Darc inputs: diff --git a/global.json b/global.json index 3d11cb5599a3..5d0688a3e740 100644 --- a/global.json +++ b/global.json @@ -7,7 +7,7 @@ "errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally." }, "tools": { - "dotnet": "10.0.100-rc.1.25451.107", + "dotnet": "10.0.100-rc.2.25502.107", "runtimes": { "dotnet": [ "$(MicrosoftNETCorePlatformsPackageVersion)" diff --git a/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj b/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj index 87a397c3dd15..6391d60021e1 100644 --- a/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj +++ b/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj @@ -8,6 +8,8 @@ --> net6.0;net10.0 MicrosoftAspNetCore + + true diff --git a/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs b/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs index 55770d524293..2929d4f1e71e 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs @@ -6,7 +6,7 @@ using Microsoft.Build.Graph; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; -using Microsoft.CodeAnalysis.ExternalAccess.Watch.Api; +using Microsoft.CodeAnalysis.ExternalAccess.HotReload.Api; using Microsoft.DotNet.HotReload; using Microsoft.Extensions.Logging; @@ -16,7 +16,7 @@ internal sealed class CompilationHandler : IDisposable { public readonly IncrementalMSBuildWorkspace Workspace; private readonly ILogger _logger; - private readonly WatchHotReloadService _hotReloadService; + private readonly HotReloadService _hotReloadService; private readonly ProcessRunner _processRunner; /// @@ -35,7 +35,7 @@ internal sealed class CompilationHandler : IDisposable /// /// All updates that were attempted. Includes updates whose application failed. /// - private ImmutableList _previousUpdates = []; + private ImmutableList _previousUpdates = []; private bool _isDisposed; @@ -44,7 +44,7 @@ public CompilationHandler(ILogger logger, ProcessRunner processRunner) _logger = logger; _processRunner = processRunner; Workspace = new IncrementalMSBuildWorkspace(logger); - _hotReloadService = new WatchHotReloadService(Workspace.CurrentSolution.Services, () => ValueTask.FromResult(GetAggregateCapabilities())); + _hotReloadService = new HotReloadService(Workspace.CurrentSolution.Services, () => ValueTask.FromResult(GetAggregateCapabilities())); } public void Dispose() @@ -299,7 +299,7 @@ private static void PrepareCompilations(Solution solution, string projectPath, C } public async ValueTask<( - ImmutableArray projectUpdates, + ImmutableArray projectUpdates, ImmutableArray projectsToRebuild, ImmutableArray projectsToRedeploy, ImmutableArray projectsToRestart)> HandleManagedCodeChangesAsync( @@ -315,14 +315,14 @@ private static void PrepareCompilations(Solution solution, string projectPath, C let runningProject = GetCorrespondingRunningProject(project, runningProjects) where runningProject != null let autoRestartProject = autoRestart || runningProject.ProjectNode.IsAutoRestartEnabled() - select (project.Id, info: new WatchHotReloadService.RunningProjectInfo() { RestartWhenChangesHaveNoEffect = autoRestartProject })) + select (project.Id, info: new HotReloadService.RunningProjectInfo() { RestartWhenChangesHaveNoEffect = autoRestartProject })) .ToImmutableDictionary(e => e.Id, e => e.info); var updates = await _hotReloadService.GetUpdatesAsync(currentSolution, runningProjectInfos, cancellationToken); await DisplayResultsAsync(updates, runningProjectInfos, cancellationToken); - if (updates.Status is WatchHotReloadService.Status.NoChangesToApply or WatchHotReloadService.Status.Blocked) + if (updates.Status is HotReloadService.Status.NoChangesToApply or HotReloadService.Status.Blocked) { // If Hot Reload is blocked (due to compilation error) we ignore the current // changes and await the next file change. @@ -364,7 +364,7 @@ private static void PrepareCompilations(Solution solution, string projectPath, C return (updates.ProjectUpdates, projectsToRebuild, projectsToRedeploy, projectsToRestart); } - public async ValueTask ApplyUpdatesAsync(ImmutableArray updates, CancellationToken cancellationToken) + public async ValueTask ApplyUpdatesAsync(ImmutableArray updates, CancellationToken cancellationToken) { Debug.Assert(!updates.IsEmpty); @@ -403,7 +403,7 @@ await ForEachProjectAsync(projectsToUpdate, async (runningProject, cancellationT } // msbuild workspace doesn't set TFM if the project is not multi-targeted - var tfm = WatchHotReloadService.GetTargetFramework(project); + var tfm = HotReloadService.GetTargetFramework(project); if (tfm == null) { return projectsWithPath[0]; @@ -412,18 +412,18 @@ await ForEachProjectAsync(projectsToUpdate, async (runningProject, cancellationT return projectsWithPath.SingleOrDefault(p => string.Equals(p.ProjectNode.GetTargetFramework(), tfm, StringComparison.OrdinalIgnoreCase)); } - private async ValueTask DisplayResultsAsync(WatchHotReloadService.Updates2 updates, ImmutableDictionary runningProjectInfos, CancellationToken cancellationToken) + private async ValueTask DisplayResultsAsync(HotReloadService.Updates updates, ImmutableDictionary runningProjectInfos, CancellationToken cancellationToken) { switch (updates.Status) { - case WatchHotReloadService.Status.ReadyToApply: + case HotReloadService.Status.ReadyToApply: break; - case WatchHotReloadService.Status.NoChangesToApply: + case HotReloadService.Status.NoChangesToApply: _logger.Log(MessageDescriptor.NoCSharpChangesToApply); break; - case WatchHotReloadService.Status.Blocked: + case HotReloadService.Status.Blocked: _logger.Log(MessageDescriptor.UnableToApplyChanges); break; @@ -451,7 +451,7 @@ await ForEachProjectAsync( void ReportCompilationDiagnostics(DiagnosticSeverity severity) { - foreach (var diagnostic in updates.CompilationDiagnostics) + foreach (var diagnostic in updates.PersistentDiagnostics) { if (diagnostic.Id == "CS8002") { @@ -492,7 +492,7 @@ void ReportRudeEdits() .Where(p => !updates.ProjectsToRestart.ContainsKey(p)) .ToHashSet(); - foreach (var (projectId, diagnostics) in updates.RudeEdits) + foreach (var (projectId, diagnostics) in updates.TransientDiagnostics) { foreach (var diagnostic in diagnostics) { @@ -689,7 +689,7 @@ public bool TryGetRunningProject(string projectPath, out ImmutableArray> projects, Func action, CancellationToken cancellationToken) => Task.WhenAll(projects.SelectMany(entry => entry.Value).Select(project => action(project, cancellationToken))).WaitAsync(cancellationToken); - private static ImmutableArray ToManagedCodeUpdates(ImmutableArray updates) + private static ImmutableArray ToManagedCodeUpdates(ImmutableArray updates) => [.. updates.Select(update => new HotReloadManagedCodeUpdate(update.ModuleId, update.MetadataDelta, update.ILDelta, update.PdbDelta, update.UpdatedTypes, update.RequiredCapabilities))]; } } diff --git a/src/BuiltInTools/dotnet-watch/HotReload/IncrementalMSBuildWorkspace.cs b/src/BuiltInTools/dotnet-watch/HotReload/IncrementalMSBuildWorkspace.cs index 65ab6089466c..06b79772ddf6 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/IncrementalMSBuildWorkspace.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/IncrementalMSBuildWorkspace.cs @@ -4,7 +4,7 @@ using System.Collections.Immutable; using System.Diagnostics; using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.ExternalAccess.Watch.Api; +using Microsoft.CodeAnalysis.ExternalAccess.HotReload.Api; using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.MSBuild; using Microsoft.CodeAnalysis.Text; @@ -76,7 +76,7 @@ public async Task UpdateProjectConeAsync(string rootProjectPath, CancellationTok continue; } - newSolution = WatchHotReloadService.WithProjectInfo(newSolution, ProjectInfo.Create( + newSolution = HotReloadService.WithProjectInfo(newSolution, ProjectInfo.Create( oldProjectId, newProjectInfo.Version, newProjectInfo.Name, diff --git a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj index 9d089001e2b2..aab9d8b174dc 100644 --- a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj +++ b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj @@ -43,6 +43,7 @@ + diff --git a/src/Cli/dotnet/Commands/Run/CSharpCompilerCommand.Generated.cs b/src/Cli/dotnet/Commands/Run/CSharpCompilerCommand.Generated.cs index d53f7052b754..94e889267f86 100644 --- a/src/Cli/dotnet/Commands/Run/CSharpCompilerCommand.Generated.cs +++ b/src/Cli/dotnet/Commands/Run/CSharpCompilerCommand.Generated.cs @@ -15,7 +15,7 @@ private IEnumerable GetCscArguments( [ "/unsafe-", "/checked-", - "/nowarn:1701,1702,IL2121,1701,1702", + "/nowarn:1701,1702,IL2121,1701,1702,8002", "/fullpaths", "/nostdlib+", "/errorreport:prompt", diff --git a/src/RazorSdk/Tool/GenerateCommand.cs b/src/RazorSdk/Tool/GenerateCommand.cs index 635eefd6be75..bf889875d0f7 100644 --- a/src/RazorSdk/Tool/GenerateCommand.cs +++ b/src/RazorSdk/Tool/GenerateCommand.cs @@ -4,6 +4,7 @@ #nullable disable using System.Diagnostics; +using System.Threading; using Microsoft.AspNetCore.Razor.Language; using Microsoft.CodeAnalysis.CSharp; using Microsoft.NET.Sdk.Razor.Tool.CommandLineUtils; @@ -434,6 +435,7 @@ private class StaticTagHelperFeature : RazorEngineFeatureBase, ITagHelperFeature public IReadOnlyList TagHelpers { get; set; } public IReadOnlyList GetDescriptors(CancellationToken cancellationToken) => TagHelpers; + public IReadOnlyList GetDescriptors() => TagHelpers; } } } diff --git a/test/Microsoft.NET.Build.Tests/RoslynBuildTaskTests.cs b/test/Microsoft.NET.Build.Tests/RoslynBuildTaskTests.cs index 2f473b12d72f..8e9074e1b377 100644 --- a/test/Microsoft.NET.Build.Tests/RoslynBuildTaskTests.cs +++ b/test/Microsoft.NET.Build.Tests/RoslynBuildTaskTests.cs @@ -59,7 +59,7 @@ public void FullMSBuild_SdkStyle_ToolsetPackage(bool useSharedCompilation, Langu { var testAsset = CreateProject(useSharedCompilation, language, AddCompilersToolsetPackage); var buildCommand = BuildAndRunUsingMSBuild(testAsset); - VerifyCompiler(buildCommand, AppHostCompilerFileName(language), useSharedCompilation, toolsetPackage: true); + VerifyCompiler(buildCommand, DotNetExecCompilerFileName(language), useSharedCompilation, toolsetPackage: true); } [Theory, CombinatorialData] diff --git a/test/TestAssets/TestProjects/ClassLibraryWithIsTestProjectAndOtherTestProjects/OtherTestProject/Program.cs b/test/TestAssets/TestProjects/ClassLibraryWithIsTestProjectAndOtherTestProjects/OtherTestProject/Program.cs index 1b9b5e92af36..fc9f8d4bb07f 100644 --- a/test/TestAssets/TestProjects/ClassLibraryWithIsTestProjectAndOtherTestProjects/OtherTestProject/Program.cs +++ b/test/TestAssets/TestProjects/ClassLibraryWithIsTestProjectAndOtherTestProjects/OtherTestProject/Program.cs @@ -84,7 +84,9 @@ public async Task ExecuteRequestAsync(ExecuteRequestContext context) { Uid = "Test5", DisplayName = "Test5", +#pragma warning disable CS0618 // Type or member is obsolete Properties = new PropertyBag(new CancelledTestNodeStateProperty(new Exception("this is a cancelled exception"), "not OK")), +#pragma warning restore CS0618 // Type or member is obsolete })); await context.MessageBus.PublishAsync(this, new FileArtifact(new FileInfo("file.txt"), "file", "file description")); diff --git a/test/TestAssets/TestProjects/HybridTestRunnerTestProjects/OtherTestProject/Program.cs b/test/TestAssets/TestProjects/HybridTestRunnerTestProjects/OtherTestProject/Program.cs index 1b9b5e92af36..fc9f8d4bb07f 100644 --- a/test/TestAssets/TestProjects/HybridTestRunnerTestProjects/OtherTestProject/Program.cs +++ b/test/TestAssets/TestProjects/HybridTestRunnerTestProjects/OtherTestProject/Program.cs @@ -84,7 +84,9 @@ public async Task ExecuteRequestAsync(ExecuteRequestContext context) { Uid = "Test5", DisplayName = "Test5", +#pragma warning disable CS0618 // Type or member is obsolete Properties = new PropertyBag(new CancelledTestNodeStateProperty(new Exception("this is a cancelled exception"), "not OK")), +#pragma warning restore CS0618 // Type or member is obsolete })); await context.MessageBus.PublishAsync(this, new FileArtifact(new FileInfo("file.txt"), "file", "file description")); diff --git a/test/TestAssets/TestProjects/TestProjectSolutionWithTestsAndArtifacts/TestProject/Program.cs b/test/TestAssets/TestProjects/TestProjectSolutionWithTestsAndArtifacts/TestProject/Program.cs index 8191677e5472..9fc0d44ada52 100644 --- a/test/TestAssets/TestProjects/TestProjectSolutionWithTestsAndArtifacts/TestProject/Program.cs +++ b/test/TestAssets/TestProjects/TestProjectSolutionWithTestsAndArtifacts/TestProject/Program.cs @@ -81,7 +81,9 @@ public async Task ExecuteRequestAsync(ExecuteRequestContext context) { Uid = "Test5", DisplayName = "Test5", +#pragma warning disable CS0618 // Type or member is obsolete Properties = new PropertyBag(new CancelledTestNodeStateProperty(new Exception("this is a cancelled exception"), "not OK")), +#pragma warning restore CS0618 // Type or member is obsolete })); await context.MessageBus.PublishAsync(this, new FileArtifact(new FileInfo("file.txt"), "file", "file description")); diff --git a/test/TestAssets/TestProjects/TestProjectWithMultipleTFMsSolution/TestProject/Program.cs b/test/TestAssets/TestProjects/TestProjectWithMultipleTFMsSolution/TestProject/Program.cs index 99cfc02234a4..f8b19141f356 100644 --- a/test/TestAssets/TestProjects/TestProjectWithMultipleTFMsSolution/TestProject/Program.cs +++ b/test/TestAssets/TestProjects/TestProjectWithMultipleTFMsSolution/TestProject/Program.cs @@ -81,7 +81,9 @@ public async Task ExecuteRequestAsync(ExecuteRequestContext context) { Uid = "Test5", DisplayName = "Test5", +#pragma warning disable CS0618 // Type or member is obsolete Properties = new PropertyBag(new CancelledTestNodeStateProperty(new Exception("this is a cancelled exception"), "")), +#pragma warning restore CS0618 // Type or member is obsolete })); context.Complete();