Troubleshoot msbuild update

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

eng/Version.Details.xml

@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Build" Version="17.15.0-preview-25278-01">
+    <Dependency Name="Microsoft.Build" Version="17.15.0-preview-25304-02">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>6de64741f6440bb6730d9a342934ce49d600fcc9</Sha>
+      <Sha>c74300841d44ab7c3ae814c96a45ac83c5bd456d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Framework" Version="17.15.0-preview-25278-01">
+    <Dependency Name="Microsoft.Build.Framework" Version="17.15.0-preview-25304-02">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>6de64741f6440bb6730d9a342934ce49d600fcc9</Sha>
+      <Sha>c74300841d44ab7c3ae814c96a45ac83c5bd456d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Tasks.Core" Version="17.15.0-preview-25278-01">
+    <Dependency Name="Microsoft.Build.Tasks.Core" Version="17.15.0-preview-25304-02">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>6de64741f6440bb6730d9a342934ce49d600fcc9</Sha>
+      <Sha>c74300841d44ab7c3ae814c96a45ac83c5bd456d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Utilities.Core" Version="17.15.0-preview-25278-01">
+    <Dependency Name="Microsoft.Build.Utilities.Core" Version="17.15.0-preview-25304-02">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>6de64741f6440bb6730d9a342934ce49d600fcc9</Sha>
+      <Sha>c74300841d44ab7c3ae814c96a45ac83c5bd456d</Sha>
     </Dependency>
     <Dependency Name="System.Reflection.Metadata" Version="9.0.0">
       <Uri>https://github.com/dotnet/runtime</Uri>

eng/Versions.props

@@ -103,7 +103,7 @@
     <VisualStudioProjectSystemPackagesVersion>17.14.79</VisualStudioProjectSystemPackagesVersion>
     <VisualStudioShellProjectsPackages>17.14.40254</VisualStudioShellProjectsPackages>
     <MicrosoftVisualStudioThreadingPackagesVersion>17.14.15</MicrosoftVisualStudioThreadingPackagesVersion>
-    <MicrosoftBuildVersion>17.15.0-preview-25278-01</MicrosoftBuildVersion>
+    <MicrosoftBuildVersion>17.15.0-preview-25304-02</MicrosoftBuildVersion>
     <!-- Roslyn packages -->
     <MicrosoftCodeAnalysisFeaturesVersion>$(RoslynVersion)</MicrosoftCodeAnalysisFeaturesVersion>
     <MicrosoftCodeAnalysisEditorFeaturesVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesVersion>
@@ -140,9 +140,9 @@
     <MicrosoftVisualStudioShellImmutable150Version>15.0.25123-Dev15Preview</MicrosoftVisualStudioShellImmutable150Version>
     <!-- -->
     <!-- Microsoft Build packages -->
-    <MicrosoftBuildFrameworkVersion>17.15.0-preview-25278-01</MicrosoftBuildFrameworkVersion>
-    <MicrosoftBuildTasksCoreVersion>17.15.0-preview-25278-01</MicrosoftBuildTasksCoreVersion>
-    <MicrosoftBuildUtilitiesCoreVersion>17.15.0-preview-25278-01</MicrosoftBuildUtilitiesCoreVersion>
+    <MicrosoftBuildFrameworkVersion>17.15.0-preview-25304-02</MicrosoftBuildFrameworkVersion>
+    <MicrosoftBuildTasksCoreVersion>17.15.0-preview-25304-02</MicrosoftBuildTasksCoreVersion>
+    <MicrosoftBuildUtilitiesCoreVersion>17.15.0-preview-25304-02</MicrosoftBuildUtilitiesCoreVersion>
     <!-- -->
     <!-- Visual Studio Editor packages -->
     <MicrosoftVisualStudioCoreUtilityVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioCoreUtilityVersion>

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<SVsTargetFrameworkAssemblies>, box vsTargetFrameworkAssemblies46, false)
         sp.AddService(typeof<SVsFrameworkMultiTargeting>, box vsFrameworkMultiTargeting, false)
         sp, ccn
+    let MakeMockServiceProviderAndConfigChangeNotifier47() =
+        let sp, ccn = MakeMockServiceProviderAndConfigChangeNotifierNoTargetFrameworkAssembliesService()
+        sp.AddService(typeof<SVsTargetFrameworkAssemblies>, box vsTargetFrameworkAssemblies47, false)
+        sp.AddService(typeof<SVsFrameworkMultiTargeting>, box vsFrameworkMultiTargeting, false)
+        sp, ccn
+    let MakeMockServiceProviderAndConfigChangeNotifier48() =
+        let sp, ccn = MakeMockServiceProviderAndConfigChangeNotifierNoTargetFrameworkAssembliesService()
+        sp.AddService(typeof<SVsTargetFrameworkAssemblies>, box vsTargetFrameworkAssemblies48, false)
+        sp.AddService(typeof<SVsFrameworkMultiTargeting>, 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.

vsintegration/tests/UnitTests/LegacyProjectSystem/Tests.ProjectSystem.ProjectItems.fs

@@ -18,10 +18,21 @@ type ProjectItems() =
 
     [<Fact>]
     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>) :?> 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)

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()