Rearrange output folders #7522

dsplaisted · 2017-08-25T09:28:06Z

Rearrange artifact (output) folder
Better separation between building and testing (separate stages)
This makes it possible to run a full build twice in a row without failing

This is necessary for setting the intermediate output path to work correctly

…tead of checking it in

build_projects/dotnet-cli-build/DotNetMSBuildTool.cs

+        private string GetAdditionalParameters()
+        {
+            return AdditionalParameters;
+        }


build/OutputDirectories.props

+
+      <BaseIntermediateOutputPath>$([System.IO.Path]::GetFullPath('$(BaseOutputDirectory)/obj/$(MSBuildProjectName)'))</BaseIntermediateOutputPath>
+      <OutputDirectory>$(BaseOutputDirectory)/dotnet</OutputDirectory>
+      <Stage2WithBackwardsCompatibleRuntimesOutputDirectory>$(BaseOutputDirectory)/dotnetWithBackwardsCompatibleRuntimes</Stage2WithBackwardsCompatibleRuntimesOutputDirectory>


build/OutputDirectories.props

      <IntermediateDirectory>$(BaseOutputDirectory)/intermediate</IntermediateDirectory>
      <PackagesDirectory>$(BaseOutputDirectory)/packages</PackagesDirectory>
      <SharedFrameworkPublishDirectory>$(IntermediateDirectory)/sharedFrameworkPublish</SharedFrameworkPublishDirectory>
      <!-- The 'AspNetRuntimePackageStorePublishDirectory' needs to be very short due to path length constraints on Win8.1 -->
+      <!-- Will this still work now that the stage has been added to the path? -->


wli3 · 2017-08-28T20:29:10Z

@dsplaisted windows tests are failing https://ci.dot.net/job/dotnet_cli/job/master/job/debug_windows_nt_x86_prtest/1424/testReport/

For example, "out/2" instead of "artifacts/stage2"

…roject.json based CLI

build/OutputDirectories.props

+      <!-- BaseOutputDirectory is the root output path for this stage and RID
+           BaseOutputPath is the project-specific output folder that each project builds into.
+           This is not confusing at all. -->
+      <BaseOutputDirectory>$(RepoRoot)/out/$(CliBuildStage)/$(Rid)</BaseOutputDirectory>


Previously, dotnet-deb-tool-consumer.csproj was copied to the out/artifacts folder before being restored. This no longer works as it depends on repo properties, and there is a Directory.Build.props in teh out directory to stop projects inside it from getting the repo properties. So this change restores it in-place instead.

…rops

dsplaisted · 2017-09-02T01:57:24Z

@dotnet-bot test Debian8.2 x64 Debug Build

dsplaisted · 2017-09-02T02:00:23Z

@dotnet-bot test CentOS7.1 x64 Debug Build

test/dotnet.Tests/dotnet.Tests.csproj

+
+    <WriteLinesToFile File="$(ExpectedVersionFileInIntermediateFolder)"
+                      Lines="$(VersionFileContent)"
+                      Condition=" '$(ShouldOverwriteVersionFile)' == 'true' "


Rearrange output folders

dsplaisted added 10 commits August 24, 2017 15:46

Support new output directory layout

ac99830

Move dir.props to auto-imported Directory.Build.props

ae0aa8e

This is necessary for setting the intermediate output path to work correctly

Support new artifacts layout in tests and other build logic

13da213

Use separate folders for different cases of a theory

4ccf1b6

Show path when directory delete fails in test setup

61e68e6

Copy empty Directory.Build.props to artifacts folder during build ins…

884a483

…tead of checking it in

Generate properties to pass to the next stage of the build

12f8c23

Update expected SDK version test to work with multiple stages

e4777c0

Rename Stage0 build variables to PreviousStage

c6e4c8f

Update MSI tests to use new output directory layout

2222290

dnfclas added the cla-already-signed label Aug 25, 2017

nguerrera reviewed Aug 26, 2017

View reviewed changes

build_projects/dotnet-cli-build/DotNetMSBuildTool.cs

private string GetAdditionalParameters()

{

return AdditionalParameters;

}

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

nguerrera approved these changes Aug 26, 2017

View reviewed changes

nguerrera reviewed Aug 26, 2017

View reviewed changes

dsplaisted added 2 commits August 28, 2017 11:09

Merge upstream changes

107252e

Fix DotNetRestore after merging upstream changes

fc6f2f3

dsplaisted force-pushed the fix-incremental-build branch 2 times, most recently from ed35b69 to 4e04a05 Compare August 29, 2017 02:04

Use shorter output paths to avoid max path issues on Windows

dcb3a7a

For example, "out/2" instead of "artifacts/stage2"

dsplaisted force-pushed the fix-incremental-build branch from 4e04a05 to dcb3a7a Compare August 29, 2017 13:56

dsplaisted added 4 commits August 29, 2017 09:59

Fix test asset that had NuGet.Config pointing to incorrect directory

103b8a6

Fix multiple tests using same output path

9fb5f74

Fix test assets with NuGet.Config files pointing to old layout

fd66cdc

Use a shorter path for test working directories, get rid of Stage 0 p…

4c3b13e

…roject.json based CLI

nguerrera mentioned this pull request Aug 30, 2017

Fix Linux build. cli package for testing is based on 1.x which does not work. #7387

Closed

eerhardt reviewed Aug 31, 2017

View reviewed changes

dsplaisted added 2 commits September 1, 2017 12:12

Merge upstream changes

9b33167

nguerrera approved these changes Sep 1, 2017

View reviewed changes

dsplaisted added 5 commits September 1, 2017 13:50

Delete outdated comment

546eff2

Fix test that depended on old output directory layout

27dc803

Rename output folder from out to bin

97b7553

Remove duplicate import

88319a7

Update signing.proj to use new output paths, and import common repo p…

728cea2

…rops

dsplaisted force-pushed the fix-incremental-build branch from 3957fd5 to 728cea2 Compare September 2, 2017 00:18

Update environment variables for EndToEnd test run on Debian package

6e0646f

nguerrera reviewed Sep 2, 2017

View reviewed changes

test/dotnet.Tests/dotnet.Tests.csproj

<WriteLinesToFile File="$(ExpectedVersionFileInIntermediateFolder)"

Lines="$(VersionFileContent)"

Condition=" '$(ShouldOverwriteVersionFile)' == 'true' "

This comment was marked as spam.

Sign in to view

dsplaisted merged commit c266e39 into dotnet:master Sep 2, 2017

nguerrera added a commit to nguerrera/cli that referenced this pull request Sep 27, 2017

Port dotnet#7522 from master to 2.0.x

a298ee9

Rearrange output folders

nguerrera mentioned this pull request Sep 28, 2017

Port infrastructure improvements from master to dev/release/2.0.0 #7721

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rearrange output folders #7522

Rearrange output folders #7522

dsplaisted commented Aug 25, 2017

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

wli3 commented Aug 28, 2017

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

dsplaisted commented Sep 2, 2017

dsplaisted commented Sep 2, 2017

This comment was marked as spam.

Rearrange output folders #7522

Rearrange output folders #7522

Conversation

dsplaisted commented Aug 25, 2017

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

wli3 commented Aug 28, 2017

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

dsplaisted commented Sep 2, 2017

dsplaisted commented Sep 2, 2017

This comment was marked as spam.