diff --git a/dir.props b/dir.props index af53534f88..e476b72232 100644 --- a/dir.props +++ b/dir.props @@ -70,7 +70,12 @@ ROOTFS_DIR=$(BaseIntermediatePath)crossrootfs/armel - + + + + + true + diff --git a/netci.groovy b/netci.groovy index e5ae392b78..b368e43a33 100644 --- a/netci.groovy +++ b/netci.groovy @@ -127,6 +127,9 @@ def addPushJob(String project, String branch, String os, String configuration) Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}"); + // Increase timeout. The offline build in Docker takes more than 2 hours. + Utilities.setJobTimeout(newJob, 240); + // Clone into the source-build directory Utilities.addScmInSubDirectory(newJob, project, isPR, 'source-build'); if(isPR){ diff --git a/patches/cli/0001-Use-netcoreapp2.0-for-build-framework-else-2.1.patch b/patches/cli/0001-Use-netcoreapp2.0-for-build-framework-else-2.1.patch new file mode 100644 index 0000000000..3fa96980f7 --- /dev/null +++ b/patches/cli/0001-Use-netcoreapp2.0-for-build-framework-else-2.1.patch @@ -0,0 +1,98 @@ +From 06b3a5c323acbd5cc300f63c87a4f2be35d2d987 Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Wed, 11 Apr 2018 14:25:27 -0500 +Subject: [PATCH] Use netcoreapp2.0 for build framework, else 2.1 + +Pass NETCoreAppMaximumVersion through everywhere to allow 2.1.101 tooling to build netcoreapp2.1. + +Make the dotnet-cli-build project use netcoreapp2.0 so it can run using the assemblies that 2.1.101 loads. Otherwise, System.Runtime mismatches. +--- + build.proj | 3 ++- + build/Prepare.targets | 5 +++-- + build_projects/dotnet-cli-build/dotnet-cli-build.csproj | 4 ++-- + src/redist/redist.csproj | 3 ++- + 4 files changed, 9 insertions(+), 6 deletions(-) + +diff --git a/build.proj b/build.proj +index fb895d191..6bbedfabc 100644 +--- a/build.proj ++++ b/build.proj +@@ -20,7 +20,7 @@ + DependsOnTargets="MSBuildWorkaroundTarget; + RestoreDotnetCliBuildFramework"> + +- + + +@@ -37,6 +37,7 @@ + + + $(ExtraRestoreArgs) /p:GeneratePropsFile=$(GeneratePropsFile) ++ $(ExtraRestoreArgs) /p:NETCoreAppMaximumVersion=$(NETCoreAppMaximumVersion) + $(ExtraRestoreArgs) --disable-parallel + + +diff --git a/build/Prepare.targets b/build/Prepare.targets +index 2783c8214..4a5745b88 100644 +--- a/build/Prepare.targets ++++ b/build/Prepare.targets +@@ -63,7 +63,8 @@ + + + ++ ProjectPath=""%(RestoreSrcPackagesInput.FullPath)"" ++ AdditionalParameters="/p:NETCoreAppMaximumVersion=$(NETCoreAppMaximumVersion)" /> + + + +@@ -89,7 +90,7 @@ + + ++ AdditionalParameters="/p:UsePortableLinuxSharedFramework=$(UsePortableLinuxSharedFramework) /p:NETCoreAppMaximumVersion=$(NETCoreAppMaximumVersion)" /> + + + +diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj +index bd7badca8..f57978e05 100644 +--- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj ++++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj +@@ -2,7 +2,7 @@ + + Build scripts for dotnet-cli + 1.0.0 +- $(CliTargetFramework) ++ netcoreapp2.0 + true + bin\$(Configuration) + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81 +@@ -14,7 +14,7 @@ + + + +- ++ + + + +diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj +index bc22fcf3f..7f6473ff5 100644 +--- a/src/redist/redist.csproj ++++ b/src/redist/redist.csproj +@@ -85,7 +85,8 @@ + + ++ ProjectPath="$(SrcDirectory)/tool_fsharp/tool_fsc.csproj" ++ MSBuildArgs="/p:NETCoreAppMaximumVersion=$(NETCoreAppMaximumVersion)" /> + + + +Date: Wed, 11 Apr 2018 14:27:25 -0500 +Subject: [PATCH] Make BuildFromSource disable ASP.NET dev certs + +Conditional on package restore plus a very rough #if that removes the using and call. +--- + build/BundledRuntimes.props | 6 +++--- + src/dotnet/AspNetCoreCertificateGenerator.cs | 5 +++++ + src/dotnet/dotnet.csproj | 5 ++++- + 3 files changed, 12 insertions(+), 4 deletions(-) + +diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props +index 1bf1db059..cbb656fd0 100644 +--- a/build/BundledRuntimes.props ++++ b/build/BundledRuntimes.props +@@ -55,7 +55,7 @@ + + + <_DownloadAndExtractItem Include="AspNetCoreSharedFxArchiveFile" +- Condition="!Exists('$(AspNetCoreSharedFxArchiveFile)') And !$(Architecture.StartsWith('arm'))"> ++ Condition="!Exists('$(AspNetCoreSharedFxArchiveFile)') And !$(Architecture.StartsWith('arm')) And '$(IncludeAspNetCoreRuntime)' != 'false'"> + $(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)/$(AspNetCoreSharedFxArchiveFileName)$(CoreSetupBlobAccessTokenParam) + $(AspNetCoreSharedFxArchiveFile) + $(AspNetCoreSharedFxPublishDirectory) +@@ -97,14 +97,14 @@ + + + <_DownloadAndExtractItem Include="DownloadedAspNetCoreSharedFxInstallerFile" +- Condition="'$(SkipBuildingInstallers)' != 'true' AND '$(DownloadedAspNetCoreSharedFxInstallerFile)' != '' AND !Exists($(DownloadedAspNetCoreSharedFxInstallerFile)) And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))"> ++ Condition="'$(SkipBuildingInstallers)' != 'true' AND '$(DownloadedAspNetCoreSharedFxInstallerFile)' != '' AND !Exists($(DownloadedAspNetCoreSharedFxInstallerFile)) And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm')) And '$(IncludeAspNetCoreRuntime)' != 'false'"> + $(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)/$(DownloadedAspNetCoreSharedFxInstallerFileName)$(CoreSetupBlobAccessTokenParam) + $(DownloadedAspNetCoreSharedFxInstallerFile) + + + + <_DownloadAndExtractItem Include="AspNetCoreSharedFxBaseRuntimeVersionFile" +- Condition="!Exists('$(AspNetCoreSharedFxBaseRuntimeVersionFile)') And !$(Architecture.StartsWith('arm'))"> ++ Condition="!Exists('$(AspNetCoreSharedFxBaseRuntimeVersionFile)') And !$(Architecture.StartsWith('arm')) And '$(IncludeAspNetCoreRuntime)' != 'false'"> + $(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)/$(AspNetCoreSharedFxBaseRuntimeVersionFileName)$(CoreSetupBlobAccessTokenParam) + $(AspNetCoreSharedFxBaseRuntimeVersionFile) + +diff --git a/src/dotnet/AspNetCoreCertificateGenerator.cs b/src/dotnet/AspNetCoreCertificateGenerator.cs +index d0fcf0a9a..f4930e22e 100644 +--- a/src/dotnet/AspNetCoreCertificateGenerator.cs ++++ b/src/dotnet/AspNetCoreCertificateGenerator.cs +@@ -1,7 +1,10 @@ + // Copyright (c) .NET Foundation and contributors. All rights reserved. + // Licensed under the MIT license. See LICENSE file in the project root for full license information. + ++#if !DOTNET_BUILD_FROM_SOURCE + using Microsoft.AspNetCore.DeveloperCertificates.XPlat; ++#endif ++ + using Microsoft.DotNet.Configurer; + + namespace Microsoft.DotNet.Cli +@@ -10,7 +13,9 @@ public class AspNetCoreCertificateGenerator : IAspNetCoreCertificateGenerator + { + public void GenerateAspNetCoreDevelopmentCertificate() + { ++#if !DOTNET_BUILD_FROM_SOURCE + CertificateGenerator.GenerateAspNetHttpsCertificate(); ++#endif + } + } + } +diff --git a/src/dotnet/dotnet.csproj b/src/dotnet/dotnet.csproj +index b7d26a073..1912eece2 100644 +--- a/src/dotnet/dotnet.csproj ++++ b/src/dotnet/dotnet.csproj +@@ -9,6 +9,7 @@ + true + dotnet5.4 + Microsoft.DotNet.Cli ++ $(DefineConstants);DOTNET_BUILD_FROM_SOURCE + + + +@@ -60,7 +61,6 @@ + + + +- + + + +@@ -75,6 +75,9 @@ + + + ++ ++ ++ + + + +-- +2.16.1.windows.4 + diff --git a/patches/cli/0003-Use-Repo-API-restore-sources-dependency-upgrade.patch b/patches/cli/0003-Use-Repo-API-restore-sources-dependency-upgrade.patch new file mode 100644 index 0000000000..03787322e3 --- /dev/null +++ b/patches/cli/0003-Use-Repo-API-restore-sources-dependency-upgrade.patch @@ -0,0 +1,114 @@ +From dacfcb5777443051ee656431b5fcd79aa10c3824 Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Wed, 11 Apr 2018 14:28:53 -0500 +Subject: [PATCH] Use Repo API restore sources, dependency upgrade + +--- + build.proj | 3 ++- + build/InitRepo.props | 1 + + build/NugetConfigFile.targets | 12 ++++++++---- + build/Prepare.targets | 4 ++-- + src/redist/redist.csproj | 2 +- + 5 files changed, 14 insertions(+), 8 deletions(-) + +diff --git a/build.proj b/build.proj +index 6bbedfabc..5bb0009eb 100644 +--- a/build.proj ++++ b/build.proj +@@ -20,7 +20,7 @@ + DependsOnTargets="MSBuildWorkaroundTarget; + RestoreDotnetCliBuildFramework"> + +- + + +@@ -38,6 +38,7 @@ + + $(ExtraRestoreArgs) /p:GeneratePropsFile=$(GeneratePropsFile) + $(ExtraRestoreArgs) /p:NETCoreAppMaximumVersion=$(NETCoreAppMaximumVersion) ++ $(ExtraRestoreArgs) /p:OrchestratedPackageVersionsProps=$(OrchestratedPackageVersionsProps) + $(ExtraRestoreArgs) --disable-parallel + + +diff --git a/build/InitRepo.props b/build/InitRepo.props +index 077c23937..3d40eefa1 100644 +--- a/build/InitRepo.props ++++ b/build/InitRepo.props +@@ -6,6 +6,7 @@ + $(GeneratedPropsDir)/HostInfo.props + $(GeneratedPropsDir)/BuildInfo.props + $(GeneratedPropsDir)/OrchestratedPackageVersionsProps.props ++ $(DotNetPackageVersionPropsPath) + $(RepoRoot)/NuGet.Config + + +diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets +index aa0b563ae..d1095d7a6 100644 +--- a/build/NugetConfigFile.targets ++++ b/build/NugetConfigFile.targets +@@ -1,9 +1,13 @@ + ++ ++ + + +- +- +- ++ ++ ++ ++ + + + +@@ -47,7 +51,7 @@ + Lines="$(NugetConfigHeader)" + Overwrite="true" /> + +- +diff --git a/build/Prepare.targets b/build/Prepare.targets +index 4a5745b88..7777f07d8 100644 +--- a/build/Prepare.targets ++++ b/build/Prepare.targets +@@ -64,7 +64,7 @@ + + ++ AdditionalParameters="/p:NETCoreAppMaximumVersion=$(NETCoreAppMaximumVersion) /p:OrchestratedPackageVersionsProps=$(OrchestratedPackageVersionsProps)" /> + + + +@@ -90,7 +90,7 @@ + + ++ AdditionalParameters="/p:UsePortableLinuxSharedFramework=$(UsePortableLinuxSharedFramework) /p:NETCoreAppMaximumVersion=$(NETCoreAppMaximumVersion) /p:OrchestratedPackageVersionsProps=$(OrchestratedPackageVersionsProps)" /> + + + +diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj +index 7f6473ff5..04b9a7496 100644 +--- a/src/redist/redist.csproj ++++ b/src/redist/redist.csproj +@@ -86,7 +86,7 @@ + ++ MSBuildArgs="/p:NETCoreAppMaximumVersion=$(NETCoreAppMaximumVersion) /p:OrchestratedPackageVersionsProps=$(OrchestratedPackageVersionsProps)" /> + + + +Date: Wed, 11 Apr 2018 16:32:23 -0500 +Subject: [PATCH] Don't include MSBuild win runtime packages if BfS + +--- + .../Microsoft.DotNet.MSBuildSdkResolver.csproj | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj +index 2b8b1b320..eb65540da 100644 +--- a/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj ++++ b/src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj +@@ -6,6 +6,7 @@ + netstandard2.0 + AnyCPU + win-x86;win-x64 ++ + true + ../../tools/Key.snk + true +-- +2.16.1.windows.4 + diff --git a/patches/cli/0005-Use-CoreSetupRid-to-redist.patch b/patches/cli/0005-Use-CoreSetupRid-to-redist.patch new file mode 100644 index 0000000000..81f842848e --- /dev/null +++ b/patches/cli/0005-Use-CoreSetupRid-to-redist.patch @@ -0,0 +1,26 @@ +From ca0d524c44d9b2e575dd52a2b13c42f1f44da059 Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Wed, 11 Apr 2018 17:03:28 -0500 +Subject: [PATCH] Use "CoreSetupRid" to redist + +Make sure Microsoft.NETCore.DotNetAppHost, for example, can be restored. +--- + build/AppHostTemplate.proj | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/AppHostTemplate.proj b/build/AppHostTemplate.proj +index 598f250b6..ba80aa405 100644 +--- a/build/AppHostTemplate.proj ++++ b/build/AppHostTemplate.proj +@@ -35,7 +35,7 @@ + + + +- --runtime $(Rid) ++ --runtime $(CoreSetupRid) + $(AppHostTemplateRestoreAdditionalParameters) /p:TargetFramework=$(CliTargetFramework) + $(AppHostTemplateRestoreAdditionalParameters) /p:TemplateFillInPackageName=$(TemplateFillInPackageName) + $(AppHostTemplateRestoreAdditionalParameters) /p:TemplateFillInPackageVersion=$(TemplateFillInPackageVersion) +-- +2.16.1.windows.4 + diff --git a/patches/cli/0006-Diag-help-log-build-commands-and-create-binlogs.patch b/patches/cli/0006-Diag-help-log-build-commands-and-create-binlogs.patch new file mode 100644 index 0000000000..0584fa3ba5 --- /dev/null +++ b/patches/cli/0006-Diag-help-log-build-commands-and-create-binlogs.patch @@ -0,0 +1,27 @@ +From fab84ae3503378c61fdff8eb5fe4563949a96a92 Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Wed, 11 Apr 2018 14:32:39 -0500 +Subject: [PATCH] Diag help: log build commands and create binlogs + +--- + run-build.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/run-build.sh b/run-build.sh +index 9ebba823b..61373f715 100755 +--- a/run-build.sh ++++ b/run-build.sh +@@ -186,8 +186,8 @@ fi + export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + + if [ $BUILD -eq 1 ]; then +- dotnet msbuild build.proj /p:Architecture=$ARCHITECTURE $CUSTOM_BUILD_ARGS /p:GeneratePropsFile=true /t:WriteDynamicPropsToStaticPropsFiles $argsnotargets +- dotnet msbuild build.proj /m /v:normal /fl /flp:v=diag /p:Architecture=$ARCHITECTURE $CUSTOM_BUILD_ARGS $args ++ (set -x; dotnet msbuild build.proj /bl:msbuild.generatepropsfile.binlog /p:Architecture=$ARCHITECTURE $CUSTOM_BUILD_ARGS /p:GeneratePropsFile=true /t:WriteDynamicPropsToStaticPropsFiles $argsnotargets) ++ (set -x; dotnet msbuild build.proj /m /v:normal /bl:msbuild.binlog /fl /flp:v=diag /p:Architecture=$ARCHITECTURE $CUSTOM_BUILD_ARGS $args) + else + echo "Not building due to --nobuild" + echo "Command that would be run is: 'dotnet msbuild build.proj /m /p:Architecture=$ARCHITECTURE $CUSTOM_BUILD_ARGS $args'" +-- +2.16.1.windows.4 + diff --git a/patches/cli/0007-Fix-argsnotargets.patch b/patches/cli/0007-Fix-argsnotargets.patch new file mode 100644 index 0000000000..e0d2f400d7 --- /dev/null +++ b/patches/cli/0007-Fix-argsnotargets.patch @@ -0,0 +1,26 @@ +From 09fe4af654e7f06b45f67cc24680233c7574c6bb Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Thu, 12 Apr 2018 21:27:19 -0500 +Subject: [PATCH] Fix argsnotargets + +The array argsnotargets was being treated as if it were a string, which only uses the first element. +--- + run-build.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/run-build.sh b/run-build.sh +index 61373f715..98e2c9741 100755 +--- a/run-build.sh ++++ b/run-build.sh +@@ -186,7 +186,7 @@ fi + export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + + if [ $BUILD -eq 1 ]; then +- (set -x; dotnet msbuild build.proj /bl:msbuild.generatepropsfile.binlog /p:Architecture=$ARCHITECTURE $CUSTOM_BUILD_ARGS /p:GeneratePropsFile=true /t:WriteDynamicPropsToStaticPropsFiles $argsnotargets) ++ (set -x; dotnet msbuild build.proj /bl:msbuild.generatepropsfile.binlog /p:Architecture=$ARCHITECTURE $CUSTOM_BUILD_ARGS /p:GeneratePropsFile=true /t:WriteDynamicPropsToStaticPropsFiles ${argsnotargets[@]}) + (set -x; dotnet msbuild build.proj /m /v:normal /bl:msbuild.binlog /fl /flp:v=diag /p:Architecture=$ARCHITECTURE $CUSTOM_BUILD_ARGS $args) + else + echo "Not building due to --nobuild" +-- +2.16.1.windows.4 + diff --git a/patches/cli/0008-Identity-not-Filename-in-NugetConfigPrivateFeeds.patch b/patches/cli/0008-Identity-not-Filename-in-NugetConfigPrivateFeeds.patch new file mode 100644 index 0000000000..43c3b3f959 --- /dev/null +++ b/patches/cli/0008-Identity-not-Filename-in-NugetConfigPrivateFeeds.patch @@ -0,0 +1,26 @@ +From 05301ce81fa39e531b8324bdf3e7fb21c591564a Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Thu, 12 Apr 2018 21:49:01 -0500 +Subject: [PATCH] Identity, not Filename, in NugetConfigPrivateFeeds + +The key must be unique or NuGet ignores the later feeds. Filename seems indended to make them unique, which doesn't work for source-build because there is no filename for the local directories source-build passes. +--- + build/NugetConfigFile.targets | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets +index d1095d7a6..e886b50aa 100644 +--- a/build/NugetConfigFile.targets ++++ b/build/NugetConfigFile.targets +@@ -53,7 +53,7 @@ + + + + +Date: Fri, 13 Apr 2018 09:41:58 -0500 +Subject: [PATCH] Use existing GitInfo* if provided + +This allows the caller to avoid the git calls when not building in a repository. +--- + build/GitCommitInfo.targets | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/build/GitCommitInfo.targets b/build/GitCommitInfo.targets +index 6ac729e50..baf01a253 100644 +--- a/build/GitCommitInfo.targets ++++ b/build/GitCommitInfo.targets +@@ -1,12 +1,14 @@ + + + ++ ConsoleToMSBuild="true" ++ Condition=" '$(GitInfoCommitCount)' == '' "> + + + + ++ ConsoleToMSBuild="true" ++ Condition=" '$(GitInfoCommitHash)' == '' "> + + + +-- +2.16.1.windows.4 + diff --git a/patches/nuget-client/0001-Mark-NuGet.Configuration-xplat.patch b/patches/nuget-client/0001-Mark-NuGet.Configuration-xplat.patch new file mode 100644 index 0000000000..cba9c29c74 --- /dev/null +++ b/patches/nuget-client/0001-Mark-NuGet.Configuration-xplat.patch @@ -0,0 +1,24 @@ +From 218310c19175af8cd4807d8653f620d8f1792441 Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Thu, 12 Apr 2018 11:29:12 -0500 +Subject: [PATCH] Mark NuGet.Configuration xplat + +--- + src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj +index 3b3a0c9ba..4486af683 100644 +--- a/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj ++++ b/src/NuGet.Core/NuGet.Configuration/NuGet.Configuration.csproj +@@ -11,6 +11,7 @@ + true + true + true ++ true + + + +-- +2.16.1.windows.4 + diff --git a/patches/symreader-portable/0001-Revert-Update-SRM-SCI-to-preview2-26401-03.patch b/patches/symreader-portable/0001-Revert-Update-SRM-SCI-to-preview2-26401-03.patch new file mode 100644 index 0000000000..87a4bce247 --- /dev/null +++ b/patches/symreader-portable/0001-Revert-Update-SRM-SCI-to-preview2-26401-03.patch @@ -0,0 +1,33 @@ +From 2316ef46ee17fc1aa1e398afb0791cfa2bf5d670 Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Thu, 12 Apr 2018 12:54:23 -0500 +Subject: [PATCH] Revert "Update SRM, SCI to preview2-26401-03" + +This reverts commit 58d468a5b917c8bf96ab3a95393bdaa11f2d3287. +--- + eng/Versions.props | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/eng/Versions.props b/eng/Versions.props +index db097dd..6d9dd71 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -6,12 +6,12 @@ + beta + + +- 1.3.0-beta-62801-02 ++ 1.2.0 + 1.7.0 + + +- 1.5.0-preview2-26401-03 +- 1.6.0-preview2-26401-03 ++ 1.3.1 ++ 1.4.2 + 4.3.0 + + +-- +2.16.1.windows.4 + diff --git a/patches/symreader/0001-Revert-Update-SRM-SCI-to-preview2-26401-03.patch b/patches/symreader/0001-Revert-Update-SRM-SCI-to-preview2-26401-03.patch new file mode 100644 index 0000000000..8c6c3a355e --- /dev/null +++ b/patches/symreader/0001-Revert-Update-SRM-SCI-to-preview2-26401-03.patch @@ -0,0 +1,28 @@ +From 9aba3d92f60a223f4f1d83885d82279780d9c5d0 Mon Sep 17 00:00:00 2001 +From: Davis Goodin +Date: Thu, 12 Apr 2018 12:53:39 -0500 +Subject: [PATCH] Revert "Update SRM, SCI to preview2-26401-03" + +This reverts commit ac20b8b45ebbd49f268fdc76fd671874e4c03b0e. +--- + eng/Versions.props | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/eng/Versions.props b/eng/Versions.props +index e1a6055..635a6be 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -8,8 +8,8 @@ + beta + + +- 1.5.0-preview2-26401-03 +- 1.6.0-preview2-26401-03 ++ 1.3.1 ++ 1.4.2 + 4.3.0 + + +-- +2.16.1.windows.4 + diff --git a/repos/cli.proj b/repos/cli.proj index af0b354579..f2408da932 100644 --- a/repos/cli.proj +++ b/repos/cli.proj @@ -2,16 +2,41 @@ - '/p:CLITargets=\"\"\"Prepare;Compile;Package\"\"\"' - '/p:CLITargets="Prepare;Compile;Package"' - $(ProjectDirectory)build$(ShellExtension) $(CLITargetsArgument) /v:detailed /p:SkipBuildingInstallers=true /p:IncludeNuGetPackageArchive=false /p:IncludeAdditionalSharedFrameworks=false /flp:v=detailed /p:CoreSetupBlobRootUrl=file:%2F%2F$(LocalBlobStorageRoot) /p:ExternalRestoreSources=$(SourceBuiltPackagesPath) /p:UsePortableLinuxSharedFramework=false /p:IncludeSharedFrameworksForBackwardsCompatibilityTests=false /p:IncludeAspNetCoreRuntime=false /p:IncludeMSBuildSdkResolver=false - $(ProjectDirectory)artifacts/linux-x64/packages/ + --stage0 $(DotNetCliToolDir) + + + $(BuildCommandArgs) /p:NETCoreAppMaximumVersion=99.9 + + + $(BuildCommandArgs) /p:CoreSetupBlobRootUrl=file:%2F%2F$(LocalBlobStorageRoot) + + $(BuildCommandArgs) /p:SkipBuildingInstallers=true + $(BuildCommandArgs) /p:IncludeNuGetPackageArchive=false + $(BuildCommandArgs) /p:IncludeAdditionalSharedFrameworks=false + $(BuildCommandArgs) /p:UsePortableLinuxSharedFramework=false + $(BuildCommandArgs) /p:IncludeSharedFrameworksForBackwardsCompatibilityTests=false + $(BuildCommandArgs) /p:IncludeAspNetCoreRuntime=false + $(BuildCommandArgs) /p:IncludeMSBuildSdkResolver=false + + $(BuildCommandArgs) '/p:CLITargets=\"\"\"Prepare;Compile;Package\"\"\"' + $(BuildCommandArgs) '/p:CLITargets="Prepare;Compile;Package"' + + $(BuildCommandArgs) /v:detailed + + $(ProjectDirectory)build$(ShellExtension) $(BuildCommandArgs) + + $(ProjectDirectory)bin/2/linux-x64/packages/ $(PackagesOutput) + 6908 38031f6e5c3e21fa39d82aca300f5ed769be10a0 - (set DOTNET_VERSION_URL=file:%2F%2F$(LocalBuildInfoRoot)) & (set GITHUB_UPSTREAM_BRANCH=release/2.0.0) & powershell.exe -NoProfile $(ProjectDirectory)build_projects/update-dependencies/update-dependencies.ps1 -Update - DOTNET_VERSION_URL=file:%2F%2F$(LocalBuildInfoRoot) GITHUB_UPSTREAM_BRANCH=release/2.0.0 $(ProjectDirectory)build_projects/update-dependencies/update-dependencies$(ShellExtension) --Update + false + true + true @@ -36,6 +61,25 @@ + + + + + + diff --git a/repos/known-good.proj b/repos/known-good.proj index b719089782..5570845a31 100644 --- a/repos/known-good.proj +++ b/repos/known-good.proj @@ -47,6 +47,10 @@ + + + + diff --git a/repos/msbuild.proj b/repos/msbuild.proj index ada27d3422..1832e9b218 100644 --- a/repos/msbuild.proj +++ b/repos/msbuild.proj @@ -4,7 +4,8 @@ 71eedf98975925fa7f2f3e669d19ba6c81391048 $(ProjectDirectory)/artifacts/$(Configuration)/packages - $(ProjectDirectory)build/build$(ShellExtension) build -DotNetBuildFromSource -DotNetCoreSdkDir $(DotNetCliToolDir) -bootstraponly -skiptests -pack -configuration $(Configuration) /p:DisableNerdbankVersioning=true /p:GitHeadSha=$(LatestCommit) + /p:VersionBase=15.1.9999 /p:DisableNerdbankVersioning=true + $(ProjectDirectory)build/build$(ShellExtension) build -DotNetBuildFromSource -DotNetCoreSdkDir $(DotNetCliToolDir) -bootstraponly -skiptests -pack -configuration $(Configuration) /p:GitHeadSha=$(LatestCommit) $(OutputVersionArgs) true false