Arcade layout (#31560)

* Remove RuntimeIdentifier specification * Arcade directory layout
dotnet · Dec 10, 2018 · d7e493956ffcbf0e932097f6f3e1fa3fa1699087 · d7e4939
1 parent 5b12593
commit d7e493956ffcbf0e932097f6f3e1fa3fa1699087
diff --git a/.gitignore b/.gitignore
@@ -9,7 +9,7 @@
 .vs/
 # Build results
-  
-[Bb]inaries/
+  
+[Aa]rtifacts/
 [Dd]ebug/
 [Rr]elease/
 x64/
diff --git a/Build.cmd b/Build.cmd
@@ -1,2 +1,2 @@
 @echo off
-  
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0build\scripts\build.ps1""" -build %*"
+  
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\build.ps1""" -build %*"
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,5 +1,5 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project>
-  
-  <Import Project="build\Targets\Settings.props" />
+  
+  <Import Project="eng\targets\Settings.props" />
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,4 +1,4 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project>
-  
-  <Import Project="build\Targets\Imports.targets" />
+  
+  <Import Project="eng\targets\Imports.targets" />
 </Project>
diff --git a/Restore.cmd b/Restore.cmd
@@ -1,2 +1,2 @@
 @echo off
-  
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0build\scripts\build.ps1""" -restore %*"
+  
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\build.ps1""" -restore %*"
diff --git a/Roslyn.sln b/Roslyn.sln
@@ -303,8 +303,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Remo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Remote.ServiceHub", "src\Workspaces\Remote\ServiceHub\Microsoft.CodeAnalysis.Remote.ServiceHub.csproj", "{80FDDD00-9393-47F7-8BAF-7E87CE011068}"
 EndProject
-  
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RepoUtil", "src\Tools\RepoUtil\RepoUtil.csproj", "{1CA184D3-89CB-4074-BEC5-F8AEBA657D41}"
-  
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Build.Tasks.CodeAnalysis", "src\Compilers\Core\MSBuildTask\Microsoft.Build.Tasks.CodeAnalysis.csproj", "{7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roslyn.VisualStudio.RemoteHostClientMock", "src\VisualStudio\RemoteHostClientMock\Roslyn.VisualStudio.RemoteHostClientMock.csproj", "{7259740A-FD0E-480F-A7D4-08BE90AC9051}"
@@ -359,8 +357,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnalyzerRunner", "src\Tools
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IlAsmDeploy", "src\Tools\ILAsm\IlAsmDeploy.csproj", "{DA8522ED-02BC-499C-AC71-1DF884F63987}"
 EndProject
-  
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roslyn.MSBuild.Util", "src\Tools\BuildUtil\Roslyn.MSBuild.Util.csproj", "{137922A2-5B1E-44C4-B0EC-0F49D2BD323A}"
-  
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Debugging.Package", "src\Dependencies\CodeAnalysis.Debugging\Microsoft.CodeAnalysis.Debugging.Package.csproj", "{FC2AE90B-2E4B-4045-9FDD-73D4F5ED6C89}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.PooledObjects.Package", "src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.Package.csproj", "{49E7C367-181B-499C-AC2E-8E17C81418D6}"
@@ -878,10 +874,6 @@ Global
 		{80FDDD00-9393-47F7-8BAF-7E87CE011068}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{80FDDD00-9393-47F7-8BAF-7E87CE011068}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{80FDDD00-9393-47F7-8BAF-7E87CE011068}.Release|Any CPU.Build.0 = Release|Any CPU
-  
-		{1CA184D3-89CB-4074-BEC5-F8AEBA657D41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-  
-		{1CA184D3-89CB-4074-BEC5-F8AEBA657D41}.Debug|Any CPU.Build.0 = Debug|Any CPU
-  
-		{1CA184D3-89CB-4074-BEC5-F8AEBA657D41}.Release|Any CPU.ActiveCfg = Release|Any CPU
-  
-		{1CA184D3-89CB-4074-BEC5-F8AEBA657D41}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -990,10 +982,6 @@ Global
 		{DA8522ED-02BC-499C-AC71-1DF884F63987}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DA8522ED-02BC-499C-AC71-1DF884F63987}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DA8522ED-02BC-499C-AC71-1DF884F63987}.Release|Any CPU.Build.0 = Release|Any CPU
-  
-		{137922A2-5B1E-44C4-B0EC-0F49D2BD323A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-  
-		{137922A2-5B1E-44C4-B0EC-0F49D2BD323A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-  
-		{137922A2-5B1E-44C4-B0EC-0F49D2BD323A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-  
-		{137922A2-5B1E-44C4-B0EC-0F49D2BD323A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FC2AE90B-2E4B-4045-9FDD-73D4F5ED6C89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FC2AE90B-2E4B-4045-9FDD-73D4F5ED6C89}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FC2AE90B-2E4B-4045-9FDD-73D4F5ED6C89}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1209,7 +1197,6 @@ Global
 		{C1930979-C824-496B-A630-70F5369A636F} = {C2D1346B-9665-4150-B644-075CF1636BAA}
 		{F822F72A-CC87-4E31-B57D-853F65CBEBF3} = {55A62CFA-1155-46F1-ADF3-BEEE51B58AB5}
 		{80FDDD00-9393-47F7-8BAF-7E87CE011068} = {55A62CFA-1155-46F1-ADF3-BEEE51B58AB5}
-  
-		{1CA184D3-89CB-4074-BEC5-F8AEBA657D41} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
 		{7AD4FE65-9A30-41A6-8004-AA8F89BCB7F3} = {A41D1B99-F489-4C43-BBDF-96D61B19A6B9}
 		{7259740A-FD0E-480F-A7D4-08BE90AC9051} = {8DBA5174-B0AA-4561-82B1-A46607697753}
 		{2E1658E2-5045-4F85-A64C-C0ECCD39F719} = {8DBA5174-B0AA-4561-82B1-A46607697753}
@@ -1237,7 +1224,6 @@ Global
 		{FFB00FB5-8C8C-4A02-B67D-262B9D28E8B1} = {EE97CB90-33BB-4F3A-9B3D-69375DEC6AC6}
 		{60166C60-813C-46C4-911D-2411B4ABBC0F} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
 		{DA8522ED-02BC-499C-AC71-1DF884F63987} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
-  
-		{137922A2-5B1E-44C4-B0EC-0F49D2BD323A} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
 		{FC2AE90B-2E4B-4045-9FDD-73D4F5ED6C89} = {C2D1346B-9665-4150-B644-075CF1636BAA}
 		{49E7C367-181B-499C-AC2E-8E17C81418D6} = {C2D1346B-9665-4150-B644-075CF1636BAA}
 		{037F06F0-3BE8-42D0-801E-2F74FC380AB8} = {55A62CFA-1155-46F1-ADF3-BEEE51B58AB5}
diff --git a/Test.cmd b/Test.cmd
@@ -1,2 +1,2 @@
 @echo off
-  
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0build\scripts\build.ps1""" -test %*"
+  
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\build.ps1""" -test %*"
diff --git a/azure-pipelines-integration.yml b/azure-pipelines-integration.yml
@@ -11,21 +11,21 @@ jobs:
  timeoutInMinutes: 90
  steps:
-  
-    - script: build/scripts/cibuild.cmd -configuration $(_configuration) -prepareMachine -testVsi 
+  
+    - script: eng/cibuild.cmd -configuration $(_configuration) -prepareMachine -testVsi 
      displayName: Build and Test
    - task: PublishTestResults@1
      inputs:
        testRunner: XUnit
-  
-        testResultsFiles: $(Build.SourcesDirectory)\Binaries\TestResults\$(_configuration)\*.xml
+  
+        testResultsFiles: $(Build.SourcesDirectory)\artifacts\TestResults\$(_configuration)\*.xml
        mergeTestResults: true
        testRunTitle: 'Windows Visual Studio Integration $(_configuration)' 
      condition: always()
    - task: PublishBuildArtifacts@1
      displayName: Publish Logs
      inputs:
-  
-        PathtoPublish: '$(Build.SourcesDirectory)\Binaries\$(_configuration)\Logs'
+  
+        PathtoPublish: '$(Build.SourcesDirectory)\artifacts\log\$(_configuration)'
        ArtifactName: 'Windows Visual Studio Integration $(_configuration)'
        publishLocation: Container
      continueOnError: true
@@ -34,7 +34,7 @@ jobs:
    - task: PublishBuildArtifacts@1
      displayName: Publish Screenshots
      inputs:
-  
-        PathtoPublish: '$(Build.SourcesDirectory)\Binaries\$(_configuration)\UnitTests\Microsoft.VisualStudio.LanguageServices.IntegrationTests\xUnitResults/'
+  
+        PathtoPublish: '$(Build.SourcesDirectory)\artifacts\bin\Microsoft.VisualStudio.LanguageServices.IntegrationTests\$(_configuration)\net472\xUnitResults'
        ArtifactName: 'Screenshots $(_configuration)' 
        publishLocation: Container
      continueOnError: true
diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
@@ -38,16 +38,10 @@ jobs:
  - task: NuGetRestore@1
    inputs:
-  
-      solution: 'build\ToolsetPackages\InternalToolset.csproj'
+  
+      solution: 'eng\internal\Toolset.csproj'
      feed: '8f470c7e-ac49-4afe-a6ee-cf784e438b93'
-  
-  - task: CmdLine@1
-  
-    displayName: Create output directory
-  
-    inputs:
-  
-      filename: mkdir
-  
-      arguments: 'Binaries\$(BuildConfiguration)'
-  
-
-  
-  - script: build\scripts\cibuild.cmd
+  
+  - script: eng\cibuild.cmd
              -configuration $(BuildConfiguration) -official -testDesktop -procdump
              /p:DotNetSignType=$(PB_SignType)
              /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
@@ -59,7 +53,7 @@ jobs:
    displayName: Publish Assets
    inputs:
      arguments: '-configuration $(BuildConfiguration) -branchName "$(Build.SourceBranch)" -mygetApiKey $(Roslyn.MyGetApiKey) -nugetApiKey $(Roslyn.NuGetApiKey) -gitHubUserName $(Roslyn.GitHubUserName) -gitHubToken $(Roslyn.GitHubToken) -gitHubEmail $(Roslyn.GitHubEmail)'
-  
-      filePath: 'build\scripts\publish-assets.ps1'
+  
+      filePath: 'eng\publish-assets.ps1'
    condition: succeeded()
  ### BEGIN OPTPROF TASKS ###
@@ -69,7 +63,7 @@ jobs:
    inputs:
      dropServiceURI: 'https://devdiv.artifacts.visualstudio.com'
      buildNumber: 'ProfilingInputs/DevDiv/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildId)'
-  
-      sourcePath: '$(Build.SourcesDirectory)\Binaries\$(BuildConfiguration)\DevDivInsertionFiles\OptProf'
+  
+      sourcePath: '$(Build.SourcesDirectory)\artifacts\OptProf\$(BuildConfiguration)\Data'
      toLowerCase: false
      usePat: false
    displayName: 'OPTPROF - Publish to Artifact Services - ProfilingInputs'
@@ -78,7 +72,7 @@ jobs:
  # Created a exe that will install visual studio with this version 
  - task: PowerShell@2
    inputs:
-  
-      filePath: build\scripts\setmanifestpaths.ps1
+  
+      filePath: eng\setmanifestpaths.ps1
      failOnStderr: true
    displayName: 'OPTPROF - Set VSTS variables for vsman files'
    condition: succeededOrFailed()
@@ -88,14 +82,14 @@ jobs:
      vsMajorVersion: 16
      channelName: int.$(InsertTargetBranchShortName)
      manifests: $(SetupManifests)
-  
-      outputFolder: '$(Build.SourcesDirectory)\Binaries\VSSetup\$(BuildConfiguration)\Insertion'
+  
+      outputFolder: '$(Build.SourcesDirectory)\artifacts\VSSetup\$(BuildConfiguration)\Insertion'
    displayName: 'OPTPROF - Build VS bootstrapper'
    condition: succeededOrFailed()
  # Publish run settings
  - task: PowerShell@2
    inputs:
-  
-      filePath: build\scripts\createrunsettings.ps1
+  
+      filePath: eng\createrunsettings.ps1
      arguments: -release
      failOnStderr: true
    displayName: 'OPTPROF - generate runsettings file'
@@ -113,7 +107,7 @@ jobs:
  # Publish scripts to get the branch of VS that this inserts into
  - task: PublishBuildArtifacts@1
    inputs:
-  
-      PathtoPublish: '$(Build.SourcesDirectory)\Binaries\$(BuildConfiguration)\DevDivInsertionFiles\BranchInfo'
+  
+      PathtoPublish: '$(Build.SourcesDirectory)\artifacts\OptProf\$(BuildConfiguration)\BranchInfo'
      ArtifactName: BranchInfo
      ArtifactType: Container
    displayName: 'OPTPROF - Publish Artifact: BranchInfo'
@@ -124,7 +118,7 @@ jobs:
  - task: PublishBuildArtifacts@1
    displayName: Publish Logs
    inputs:
-  
-      PathtoPublish: '$(Build.SourcesDirectory)\Binaries\$(BuildConfiguration)\Logs'
+  
+      PathtoPublish: '$(Build.SourcesDirectory)\artifacts\log\$(BuildConfiguration)'
      ArtifactName: 'Build Diagnostic Files'
      publishLocation: Container
    continueOnError: true
@@ -134,70 +128,46 @@ jobs:
    displayName: Publish Test Results
    inputs:
      testRunner: XUnit
-  
-      testResultsFiles: '$(Build.SourcesDirectory)\Binaries\TestResults\$(BuildConfiguration)\*.xml'
+  
+      testResultsFiles: '$(Build.SourcesDirectory)\artifacts\TestResults\$(BuildConfiguration)\*.xml'
      mergeTestResults: true
      testRunTitle: 'Unit Tests'
    condition: succeededOrFailed()
+  
+  # Publishes setup VSIXes to a drop with id defined by MicroBuildSwixPlugin.
+  
+  # Note: The insertion tool looks for the display name of this task in the logs.
  - task: ms-vseng.MicroBuildTasks.4305a8de-ba66-4d8b-b2d1-0dc4ecbbf5e8.MicroBuildUploadVstsDropFolder@1
    displayName: Upload VSTS Drop
    inputs:
-  
-      DropFolder: 'Binaries\VSSetup\$(BuildConfiguration)\Insertion'
+  
+      DropFolder: 'artifacts\VSSetup\$(BuildConfiguration)\Insertion'
    condition: succeeded()
+  
+  # Publish insertion packages to CoreXT store.
  - task: NuGetCommand@2
-  
-    displayName: NuGet CoreXT publish
+  
+    displayName: Publish CoreXT Packages 
    inputs:
      command: push
      feedsToUse: config
-  
-      packagesToPush: '$(Build.SourcesDirectory)\Binaries\$(BuildConfiguration)\DevDivPackages\**\*.nupkg'
+  
+      packagesToPush: '$(Build.SourcesDirectory)\artifacts\VSSetup\$(BuildConfiguration)\DevDivPackages\**\*.nupkg'
      publishVstsFeed: '97a41293-2972-4f48-8c0e-05493ae82010'
      allowPackageConflicts: true
    condition: succeeded()
-  
-  # Publish VSTS artifact that the RoslynInsertionTool is able to find by its name.
-  
-  # The backing storage of the artifact is a file share.
-  
-  #
-  
-  # The bulk of the publish work is done by the Powershell task below. This exists to create
-  
-  # the proper entries in the build log so that the insertion tool can find the drop that 
-  
-  # needs to get published
+  
+  # Publish an artifact that the RoslynInsertionTool is able to find by its name.
  - task: PublishBuildArtifacts@1
-  
-    displayName: Publish Drop - DevDivInsertionFiles
-  
-    inputs:
-  
-      PathtoPublish: 'Binaries\$(BuildConfiguration)\DevDivInsertionFiles'
-  
-      ArtifactName: '$(Build.BuildNumber)'
-  
-      publishLocation: FilePath
-  
-      TargetPath: '$(DropRoot)\Roslyn-Signed\$(Build.SourceBranchName)\$(BuildConfiguration)'
-  
-      Parallel: true
-  
-      ParallelCount: 64
-  
-    condition: succeededOrFailed()
-  
-
-  
-  # Archive the files from the build necessary for future investigations
-  
-  - task: PowerShell@2
-  
-    displayName: Publish Drop - Binaries
+  
+    displayName: Publish Artifact VSSetup
    inputs:
-  
-      arguments: '-Source Binaries\$(BuildConfiguration) -Target $(DropRoot)\Roslyn-Signed\$(Build.SourceBranchName)\$(BuildConfiguration)\$(Build.BuildNumber) -ParallelCount 8 -Exclude UnitTests,PerfTests'
-  
-      filePath: 'build\scripts\vsts-robocopy.ps1'
-  
-    condition: succeededOrFailed()
+  
+      PathtoPublish: 'artifacts\VSSetup\$(BuildConfiguration)'
+  
+      ArtifactName: 'VSSetup'
+  
+    condition: succeeded()
-  
-  # Copy additional files to the drop directory
-  
-  - task: PowerShell@2
-  
-    displayName: Publish Drop - VSSetup
+  
+  # Archive NuGet packages to DevOps.
+  
+  - task: PublishBuildArtifacts@1
+  
+    displayName: Publish Artifact Packages
    inputs:
-  
-      arguments: '-Source Binaries\VSSetup\$(BuildConfiguration)\Insertion -Target $(DropRoot)\Roslyn-Signed\$(Build.SourceBranchName)\$(BuildConfiguration)\$(Build.BuildNumber)\Insertion -ParallelCount 8'
-  
-      filePath: 'build\scripts\vsts-robocopy.ps1'
-  
-    condition: succeededOrFailed()
+  
+      PathtoPublish: 'artifacts\packages\$(BuildConfiguration)'
+  
+      ArtifactName: 'Packages'
+  
+    condition: succeeded()
  - task: ms-vseng.MicroBuildTasks.521a94ea-9e68-468a-8167-6dcf361ea776.MicroBuildCleanup@1
    displayName: Perform Cleanup Tasks
    condition: succeededOrFailed()
-  
-
-  
-  - task: PublishBuildArtifacts@1
-  
-    displayName: Publish MicroBuild Outputs
-  
-    inputs:
-  
-      PathtoPublish: '$(Build.ArtifactStagingDirectory)\MicroBuild\Output'
-  
-      ArtifactName: '$(Build.BuildNumber)'
-  
-      publishLocation: FilePath
-  
-      TargetPath: '$(DropRoot)\Roslyn-Signed\$(Build.SourceBranchName)\$(BuildConfiguration)'
-  
-    condition: succeededOrFailed()
-  
-