Source build support #1241

codito · 2017-10-30T08:46:54Z

Allow vstest repository to build with dotnet/source-build.

Fix existing mono based builds (Build on Linux and Mac are failing because of uap10.0 TFM #1222, vstest shouldn't have a different build if mono happens to be installed on the machine #1153)
Use Ubuntu 14.04 for linux builds
Remove dependency on mono, build TestHost by default (Vstest depends on Desktop assemblies to build localized bits dotnet/source-build#96)
Port patches to vstest (Remove patches from vstest dotnet/source-build#178)
Support RepoApi for build

Validated these changes with symlink in source-build repo and built it successfully.

Localization requires xlftool (which requires mono to be available). Will fix this outside current PR.

Fake .NET desktop build environment if machine is non-windows. Fixes microsoft#1222.

Fix names for TestPlatform.nuspec and path to testhost.x86 binaries.

Use multitarget package instead.

Removed mono dependency checks. Fixes microsoft#1153.

Add support for repo API. https://github.com/dotnet/source-build/blob/dev/release/2.0/Documentation/RepoApi.md

Faizan2304 · 2017-11-01T06:30:02Z

scripts/build.sh

-        fi
-
+        # Copy TestHost for desktop targets
+        local testhost=$packageDir/TestHost


Can we publish testhost here as we doing in build.ps1.?

I will take this up in another PR.

smadala · 2017-11-01T09:28:25Z

netci.groovy

@@ -39,7 +39,7 @@ def branch = GithubBranchName
                    Utilities.setMachineAffinity(newJob, 'Windows_NT', 'latest-or-auto')
                    break;

-                case "Ubuntu16.04":
+                case "Ubuntu14.04":


Why is this required?

Making sure we run our CI in exact same configuration as Source Build repo. This will help catch issues earlier.

smadala · 2017-11-01T09:31:59Z

scripts/build.sh

+# Source build repo api
+# See https://github.com/dotnet/source-build/blob/dev/release/2.0/Documentation/RepoApi.md
+#
+DOTNETBUILDFROMSOURCE=false


Nit: DOTNET_BUILD_FROM_SOURCE

Fixed. Thanks.

smadala · 2017-11-01T09:32:24Z

scripts/build.sh

            ;;
        -p)
            PROJECT_NAME_PATTERNS=$2
+            shift
+            ;;
+        -dotnetbuildfromsource)


Sorry, didn't get it. We can't change the name of this arg, it is sent as is from RepoApi.

Can we change it to more readable DotNetBuildFromSource.

Please see Line 36. We are ensuring the script continues to run if user passes args in a different case.

smadala · 2017-11-01T09:35:17Z

scripts/build.sh

@@ -80,8 +108,8 @@ TP_SRC_DIR="$TP_ROOT_DIR/src"
 export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
 # Dotnet build doesnt support --packages yet. See https://github.com/dotnet/cli/issues/2712
 export NUGET_PACKAGES=$TP_PACKAGES_DIR
-DOTNET_CLI_VERSION="LATEST"
-DOTNET_RUNTIME_VERSION="LATEST"
+DOTNET_CLI_VERSION="2.1.0-preview1-007372"


While porting this to 15.3, make sure the vstest.console.runtimeconfig.json has compatible runtime with dotnet-cli servicing branch.

Yes, I will ensure that in the Port PR to 15.3 branch. Current PR is for master.

smadala · 2017-11-01T09:49:21Z

scripts/build.sh

-
-    log "Installing dotnet cli..."
-    local start=$SECONDS
+    if [[ $TP_USE_REPO_API ]]; then


Fixed. Thanks!

smadala · 2017-11-01T10:14:37Z

scripts/build.sh

+    export FrameworkPathOverride=$TP_PACKAGES_DIR/microsoft.targetingpack.netframework.v4.6/1.0.1/lib/net46/
+    if [ -z "$PROJECT_NAME_PATTERNS" ]
+    then
+        $dotnet build $TPB_Solution --configuration $TPB_Configuration -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild || failed=true


Script should exit on build failure?

See line 240.

should have explicit check as line 179?

smadala · 2017-11-01T10:17:33Z

src/package/nuspec/Microsoft.TestPlatform.CLI.csproj

@@ -8,5 +8,7 @@
    <!-- Don't include the output.dll and output.runtimeconfig.json files in nuget package -->
    <IncludeBuildOutput>false</IncludeBuildOutput>
    <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
+    <NoPackageAnalysis>true</NoPackageAnalysis>


Why is this?

We're not building this project, it is only required for dotnet pack, hence disabled all these options.

smadala · 2017-11-01T10:18:15Z

...TestPlatform.TranslationLayer.E2ETest/Microsoft.TestPlatform.TranslationLayer.E2ETest.csproj

@@ -17,6 +17,7 @@
  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
    <ProjectReference Include="..\UnitTestProject\UnitTestProject.csproj" />
    <Reference Include="System" />
+    <Reference Include="System.Runtime" />


Why is this?

For unix, we are referring multitargeting pack to build desktop assemblies. It requires the dependencies to be explicitly called out.

How can we make sure this for future commits?

Unix build will break if we add a dependency and not explicitly mention it in csproj. It will fail the PR :)

smadala · 2017-11-01T10:20:43Z

scripts/build.sh

@@ -24,6 +24,14 @@ CI_BUILD=false
 VERBOSE=false
 PROJECT_NAME_PATTERNS=

+#


Need to update test.sh?

Not required.

I think dotnet cli(dotnet/<any_repo>) runs tests with build.cmd, I think source-build expects tests should run as part of build.

I think source-build expects tests should run as part of build.

Didn't see any API related to running tests in the repo api docs: https://github.com/dotnet/source-build/blob/dev/release/2.0/Documentation/RepoApi.md. It only mentions build.cmd/sh.

smadala · 2017-11-01T10:21:49Z

netci.groovy

@@ -39,7 +39,7 @@ def branch = GithubBranchName
                    Utilities.setMachineAffinity(newJob, 'Windows_NT', 'latest-or-auto')
                    break;

-                case "Ubuntu16.04":
+                case "Ubuntu14.04":
                    // Define your build/test strings here.
                    def buildString = """./build.sh -c ${configuration}"""


Not going to run tests?

Not as part of this PR.

I think dotnet/cli(dotnet/<any_repo>) runs tests with build.cmd, I think source-build expects tests should run as part of build.

I am not sure, let's sync up. Here's the repo API doc I referred.

* Fix build issue for PlatformAbstractions on non windows environment. Fake .NET desktop build environment if machine is non-windows. Fixes microsoft#1222. * Use Ubuntu 14.04 since it is used in source builds. * Use exit code from build instead of log function. Fix names for TestPlatform.nuspec and path to testhost.x86 binaries. * Remove dependency on Mono for net4x builds. Use multitarget package instead. * Single build path for unix. Removed mono dependency checks. Fixes microsoft#1153. * Port vstest repo patches. Add support for repo API. https://github.com/dotnet/source-build/blob/dev/release/2.0/Documentation/RepoApi.md * Fix PR comments. * Use numeric comparisons instead of boolean in bash.

* Fix build issue for PlatformAbstractions on non windows environment. Fake .NET desktop build environment if machine is non-windows. Fixes #1222. * Use Ubuntu 14.04 since it is used in source builds. * Use exit code from build instead of log function. Fix names for TestPlatform.nuspec and path to testhost.x86 binaries. * Remove dependency on Mono for net4x builds. Use multitarget package instead. * Single build path for unix. Removed mono dependency checks. Fixes #1153. * Port vstest repo patches. Add support for repo API. https://github.com/dotnet/source-build/blob/dev/release/2.0/Documentation/RepoApi.md * Fix PR comments. * Use numeric comparisons instead of boolean in bash.

Arun Mahapatra added 4 commits October 30, 2017 08:39

Fix build issue for PlatformAbstractions on non windows environment.

d619051

Fake .NET desktop build environment if machine is non-windows. Fixes microsoft#1222.

Use Ubuntu 14.04 since it is used in source builds.

428b1be

Use exit code from build instead of log function.

70d2f43

Fix names for TestPlatform.nuspec and path to testhost.x86 binaries.

Remove dependency on Mono for net4x builds.

a269cca

Use multitarget package instead.

codito mentioned this pull request Oct 31, 2017

Reverted to stable version of dotnet cli #1245

Closed

Arun Mahapatra added 4 commits October 31, 2017 04:29

Single build path for unix.

da2d4d2

Removed mono dependency checks. Fixes microsoft#1153.

Merge remote-tracking branch 'upstream/master' into source-build

b32be25

Port vstest repo patches.

a331cf0

Add support for repo API. https://github.com/dotnet/source-build/blob/dev/release/2.0/Documentation/RepoApi.md

Merge remote-tracking branch 'upstream/master' into source-build

15ca4bf

Faizan2304 approved these changes Nov 1, 2017

View reviewed changes

smadala reviewed Nov 1, 2017

View reviewed changes

Arun Mahapatra added 3 commits November 1, 2017 11:50

Fix PR comments.

515dd4a

Merge remote-tracking branch 'upstream/master' into source-build

7b713a4

Use numeric comparisons instead of boolean in bash.

9130120

smadala approved these changes Nov 2, 2017

View reviewed changes

codito merged commit f614a31 into microsoft:master Nov 3, 2017

codito deleted the source-build branch November 3, 2017 03:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Source build support #1241

Source build support #1241

codito commented Oct 30, 2017 •

edited

Loading

Faizan2304 Nov 1, 2017

codito Nov 1, 2017

smadala Nov 1, 2017

codito Nov 1, 2017

smadala Nov 1, 2017

codito Nov 1, 2017

smadala Nov 1, 2017

codito Nov 1, 2017

smadala Nov 1, 2017

codito Nov 2, 2017

smadala Nov 1, 2017

codito Nov 1, 2017 •

edited

Loading

smadala Nov 1, 2017

codito Nov 1, 2017

smadala Nov 1, 2017

codito Nov 1, 2017

smadala Nov 1, 2017

smadala Nov 1, 2017

codito Nov 1, 2017

smadala Nov 1, 2017

codito Nov 1, 2017

smadala Nov 1, 2017

codito Nov 2, 2017

smadala Nov 1, 2017

codito Nov 1, 2017

smadala Nov 1, 2017

codito Nov 2, 2017

smadala Nov 1, 2017

codito Nov 1, 2017

smadala Nov 1, 2017

codito Nov 2, 2017

Source build support #1241

Source build support #1241

Conversation

codito commented Oct 30, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codito Nov 1, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codito commented Oct 30, 2017 •

edited

Loading

codito Nov 1, 2017 •

edited

Loading