diff --git a/azure-pipelines-PR.yml b/azure-pipelines-PR.yml index 9f06d744935..dc83c9fc7e3 100644 --- a/azure-pipelines-PR.yml +++ b/azure-pipelines-PR.yml @@ -523,6 +523,12 @@ stages: PathtoPublish: '$(Build.SourcesDirectory)\artifacts\TestResults\$(_configuration)' ArtifactName: Windows $(_configuration) $(_testKind) $(transparentCompilerSuffix) test logs publishLocation: Container + - task: PublishBuildArtifacts@1 + displayName: Publish TestToRepro Logs + inputs: + PathtoPublish: '$(Build.SourcesDirectory)\artifacts\TestResults\$(_configuration)\ReproLogs' + ArtifactName: Windows $(_configuration) $(_testKind) $(transparentCompilerSuffix) repro logs + publishLocation: Container continueOnError: true condition: always() - script: dotnet build $(Build.SourcesDirectory)/eng/DumpPackageRoot/DumpPackageRoot.csproj diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bffa9fa72b1..40b45e41e9c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/msbuild - 6de64741f6440bb6730d9a342934ce49d600fcc9 + c74300841d44ab7c3ae814c96a45ac83c5bd456d - + https://github.com/dotnet/msbuild - 6de64741f6440bb6730d9a342934ce49d600fcc9 + c74300841d44ab7c3ae814c96a45ac83c5bd456d - + https://github.com/dotnet/msbuild - 6de64741f6440bb6730d9a342934ce49d600fcc9 + c74300841d44ab7c3ae814c96a45ac83c5bd456d - + https://github.com/dotnet/msbuild - 6de64741f6440bb6730d9a342934ce49d600fcc9 + c74300841d44ab7c3ae814c96a45ac83c5bd456d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 0611637828d..b8ab5a6f60d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -103,7 +103,7 @@ 17.14.79 17.14.40254 17.14.15 - 17.15.0-preview-25278-01 + 17.15.0-preview-25304-02 $(RoslynVersion) $(RoslynVersion) @@ -140,9 +140,9 @@ 15.0.25123-Dev15Preview - 17.15.0-preview-25278-01 - 17.15.0-preview-25278-01 - 17.15.0-preview-25278-01 + 17.15.0-preview-25304-02 + 17.15.0-preview-25304-02 + 17.15.0-preview-25304-02 $(VisualStudioEditorPackagesVersion) diff --git a/vsintegration/tests/Salsa/VsMocks.fs b/vsintegration/tests/Salsa/VsMocks.fs index 863a6b075f8..0499bd4c040 100644 --- a/vsintegration/tests/Salsa/VsMocks.fs +++ b/vsintegration/tests/Salsa/VsMocks.fs @@ -1375,6 +1375,8 @@ module internal VsMocks = let vsTargetFrameworkAssemblies40 = vsTargetFrameworkAssembliesN 0x40000u let vsTargetFrameworkAssemblies45 = vsTargetFrameworkAssembliesN 0x40005u let vsTargetFrameworkAssemblies46 = vsTargetFrameworkAssembliesN 0x40006u + let vsTargetFrameworkAssemblies47 = vsTargetFrameworkAssembliesN 0x40007u + let vsTargetFrameworkAssemblies48 = vsTargetFrameworkAssembliesN 0x40008u let vsFrameworkMultiTargeting = { new IVsFrameworkMultiTargeting with @@ -1601,6 +1603,16 @@ module internal VsMocks = sp.AddService(typeof, box vsTargetFrameworkAssemblies46, false) sp.AddService(typeof, box vsFrameworkMultiTargeting, false) sp, ccn + let MakeMockServiceProviderAndConfigChangeNotifier47() = + let sp, ccn = MakeMockServiceProviderAndConfigChangeNotifierNoTargetFrameworkAssembliesService() + sp.AddService(typeof, box vsTargetFrameworkAssemblies47, false) + sp.AddService(typeof, box vsFrameworkMultiTargeting, false) + sp, ccn + let MakeMockServiceProviderAndConfigChangeNotifier48() = + let sp, ccn = MakeMockServiceProviderAndConfigChangeNotifierNoTargetFrameworkAssembliesService() + sp.AddService(typeof, box vsTargetFrameworkAssemblies48, false) + sp.AddService(typeof, box vsFrameworkMultiTargeting, false) + sp, ccn // This is the mock thing that all tests, except the multitargeting tests call. // By default, let it use the 4.0 assembly version. diff --git a/vsintegration/tests/UnitTests/LegacyProjectSystem/Tests.ProjectSystem.ProjectItems.fs b/vsintegration/tests/UnitTests/LegacyProjectSystem/Tests.ProjectSystem.ProjectItems.fs index 26c25a7edf6..e29eabc372c 100644 --- a/vsintegration/tests/UnitTests/LegacyProjectSystem/Tests.ProjectSystem.ProjectItems.fs +++ b/vsintegration/tests/UnitTests/LegacyProjectSystem/Tests.ProjectSystem.ProjectItems.fs @@ -18,10 +18,21 @@ type ProjectItems() = [] member public this.``RemoveAssemblyReference.NoIVsTrackProjectDocuments2Events``() = + let testFilesPath = Environment.GetEnvironmentVariable("XUNIT_LOGS") + //let testFilesPath = @"D:\flushingpoint" + System.Environment.SetEnvironmentVariable("MSBUILDDEBUGENGINE","1") + System.Environment.SetEnvironmentVariable("MSBUILDDEBUGCOMM","1") + System.Environment.SetEnvironmentVariable("MSBUILDDEBUGPATH",IO.Path.Combine(testFilesPath,"ReproLogs")) + this.MakeProjectAndDo(["file.fs"], ["System.Numerics"],"", (fun project -> let listener = project.Site.GetService(typeof) :?> Salsa.VsMocks.IVsTrackProjectDocuments2Listener + project.ComputeSourcesAndFlags() + System.Environment.SetEnvironmentVariable("MSBUILDDEBUGENGINE",null) + System.Environment.SetEnvironmentVariable("MSBUILDDEBUGCOMM",null) + System.Environment.SetEnvironmentVariable("MSBUILDDEBUGPATH",null) + let containsSystemNumerics () = project.CompilationOptions |> Array.exists (fun f -> f.IndexOf("System.Numerics") <> -1) diff --git a/vsintegration/tests/UnitTests/TestLib.ProjectSystem.fs b/vsintegration/tests/UnitTests/TestLib.ProjectSystem.fs index 5f9095ff4d9..e42c87c58e1 100644 --- a/vsintegration/tests/UnitTests/TestLib.ProjectSystem.fs +++ b/vsintegration/tests/UnitTests/TestLib.ProjectSystem.fs @@ -298,6 +298,8 @@ type TheTests() = File.AppendAllText(file, TheTests.FsprojTextWithProjectReferencesAndOtherFlags(compileItems, references, [], null, other, targetFramework)) let sp, cnn = match targetFramework with + | "v4.8" -> VsMocks.MakeMockServiceProviderAndConfigChangeNotifier48() + | "v4.7" -> VsMocks.MakeMockServiceProviderAndConfigChangeNotifier47() | "v4.6" -> VsMocks.MakeMockServiceProviderAndConfigChangeNotifier46() | "v4.5" -> VsMocks.MakeMockServiceProviderAndConfigChangeNotifier45() | "v4.0" -> VsMocks.MakeMockServiceProviderAndConfigChangeNotifier40()