diff --git a/build/BundledDotnetTools.proj b/build/BundledDotnetTools.proj index 3c07a51f0..57837ea01 100644 --- a/build/BundledDotnetTools.proj +++ b/build/BundledDotnetTools.proj @@ -13,12 +13,11 @@ Condition="!Exists('$(DotnetToolsNuPkgPath)/$(TemplateFillInPackageName.ToLower())')"> - --runtime any + --runtime any /p:RestoreProjectStyle=DotnetToolReference $(DotnetToolsRestoreAdditionalParameters) /p:TargetFramework=$(CliTargetFramework) $(DotnetToolsRestoreAdditionalParameters) /p:TemplateFillInPackageName=$(TemplateFillInPackageName) $(DotnetToolsRestoreAdditionalParameters) /p:TemplateFillInPackageVersion=$(TemplateFillInPackageVersion) $(DotnetToolsRestoreAdditionalParameters) /p:RestorePackagesPath=$(DotnetToolsLayoutDirectory) - $(DotnetToolsRestoreAdditionalParameters) /p:RestoreProjectStyle=$(DotnetToolsRestoreProjectStyle) -internal - - -upgrade - - dotnet-runtime-deps-$(SharedHostVersion)-$(CoreSetupRid)$(InstallerEndSuffix)$(InstallerExtension) + dotnet-runtime-deps-$(SharedHostVersion)-$(CoreSetupRid)$(InstallerExtension) $(PackagesDirectory)/$(DownloadedRuntimeDepsInstallerFileName) $(CoreSetupRid) x64 - dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerEndSuffix)$(InstallerExtension) + dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) $(PackagesDirectory)/$(DownloadedSharedHostInstallerFileName) - dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerEndSuffix)$(InstallerExtension) + dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) $(PackagesDirectory)/$(DownloadedHostFxrInstallerFileName) - dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerEndSuffix)$(InstallerExtension) + dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) $(PackagesDirectory)/$(DownloadedSharedFrameworkInstallerFileName) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 7587a5865..190b836fe 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -9,7 +9,7 @@ 2.1.0 2.1.0 2.1.0 - 2.1.0 + 2.1.1-servicing-26605-02 $(MicrosoftNETCoreAppPackageVersion) 15.8.0-preview-000086 $(MicrosoftBuildPackageVersion) diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets index 1ada841ca..042cd2e93 100644 --- a/build/MSBuildExtensions.targets +++ b/build/MSBuildExtensions.targets @@ -116,6 +116,13 @@ <_AspNetCoreAllPackageVersion>$(MicrosoftAspNetCoreAllPackageVersion) <_AspNetCoreAppPackageVersion>$(MicrosoftAspNetCoreAppPackageVersion) + + <_DefaultPatchVersionForAspNetCoreAll2_1>2.1.1 + <_DefaultPatchVersionForAspNetCoreApp2_1>$(_DefaultPatchVersionForAspNetCoreAll2_1) + + <_DefaultPatchVersionForAspNetCoreAll2_1 Condition="$(_AspNetCoreAllPackageVersion.StartsWith('$(_DefaultPatchVersionForAspNetCoreAll2_1)-'))">$(_AspNetCoreAllPackageVersion) + <_DefaultPatchVersionForAspNetCoreApp2_1 Condition="$(_AspNetCoreAppPackageVersion.StartsWith('$(_DefaultPatchVersionForAspNetCoreApp2_1)-'))">$(_AspNetCoreAppPackageVersion) + <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1]) <_NETStandardTargetFrameworkVersion>$(_NETStandardLibraryPackageVersion.Split('.')[0]).$(_NETStandardLibraryPackageVersion.Split('.')[1]) @@ -170,6 +177,10 @@ Copyright (c) .NET Foundation. All rights reserved. $(SdkVersion) <_NETCoreSdkIsPreview>$(_NETCoreSdkIsPreview) + + $(_DefaultPatchVersionForAspNetCoreAll2_1) + $(_DefaultPatchVersionForAspNetCoreApp2_1) + 1.0.11 1.1.8 diff --git a/build/Publish.targets b/build/Publish.targets index 70819a6b1..58d6057c1 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -54,6 +54,8 @@ Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "/> + diff --git a/build/Test.targets b/build/Test.targets index 39cc79f83..9f4ce8778 100644 --- a/build/Test.targets +++ b/build/Test.targets @@ -89,7 +89,7 @@ - diff --git a/build/compile/LzmaArchive.targets b/build/compile/LzmaArchive.targets index a1fa07e91..2d55fd502 100644 --- a/build/compile/LzmaArchive.targets +++ b/build/compile/LzmaArchive.targets @@ -3,6 +3,7 @@ $(SdkOutputDirectory)/nuGetPackagesArchive.lzma + $(PackagesDirectory)/nuGetPackagesArchive.lzma nuGetPackagesArchive-$(AspNetCoreVersion).lzma $(IntermediateDirectory)/$(NugetPackagesArchiveName) $(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)/$(NugetPackagesArchiveName) @@ -17,5 +18,6 @@ ContinueOnError="WarnAndContinue" /> + diff --git a/run-build.ps1 b/run-build.ps1 index 30e495d03..344cf4374 100644 --- a/run-build.ps1 +++ b/run-build.ps1 @@ -89,8 +89,8 @@ if($Architecture.StartsWith("arm", [StringComparison]::OrdinalIgnoreCase)) $InstallArchitecture = "x64" } -Write-Output "$dotnetInstallPath -version ""2.2.0-preview1-007799"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$InstallArchitecture""" -Invoke-Expression "$dotnetInstallPath -version ""2.2.0-preview1-007799"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$InstallArchitecture""" +Write-Output "$dotnetInstallPath -version ""2.1.300"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$InstallArchitecture""" +Invoke-Expression "$dotnetInstallPath -version ""2.1.300"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$InstallArchitecture""" if ($LastExitCode -ne 0) { diff --git a/run-build.sh b/run-build.sh index b22d4d1fc..1f2ed25a9 100755 --- a/run-build.sh +++ b/run-build.sh @@ -162,7 +162,7 @@ if [[ $archlower == 'arm'* ]]; then fi if [ "$STAGE0_SOURCE_DIR" == "" ]; then - (set -x ; "$REPOROOT/scripts/obtain/dotnet-install.sh" --version "2.2.0-preview1-007799" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$INSTALL_ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS) + (set -x ; "$REPOROOT/scripts/obtain/dotnet-install.sh" --version "2.1.300" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$INSTALL_ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS) else echo "Copying bootstrap cli from $STAGE0_SOURCE_DIR" cp -r $STAGE0_SOURCE_DIR/* "$DOTNET_INSTALL_DIR" diff --git a/scripts/docker/alpine.3.6/Dockerfile b/scripts/docker/alpine.3.6/Dockerfile index 746f1bd4b..2dc797963 100644 --- a/scripts/docker/alpine.3.6/Dockerfile +++ b/scripts/docker/alpine.3.6/Dockerfile @@ -9,6 +9,15 @@ FROM microsoft/dotnet-buildtools-prereqs:alpine-3.6-3148f11-20171119021156 # This Dockerfile doesn't use the USER_ID, but the parameter needs to be declared to prevent docker # from issuing a warning ARG USER_ID=0 +RUN adduser code_executor -u ${USER_ID} -G root -D +RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers + +# With the User Change, we need to change permssions on these directories +RUN chmod -R a+rwx /usr/local +RUN chmod -R a+rwx /home + +# Set user to the one we just created +USER ${USER_ID} # Set working directory WORKDIR /opt/code diff --git a/test/InsertionTests/InsertionTests.csproj b/test/InsertionTests/InsertionTests.csproj index e4ac93433..f07f2dae8 100644 --- a/test/InsertionTests/InsertionTests.csproj +++ b/test/InsertionTests/InsertionTests.csproj @@ -30,8 +30,7 @@ TemplateFillInPackageName=%(BundledDotnetTools.Identity); TemplateFillInPackageVersion=%(BundledDotnetTools.Version); PreviousStageDirectory=$(PreviousStageDirectory); - DotnetToolsLayoutDirectory=$(testAssetSourceRoot); - DotnetToolsRestoreProjectStyle=DotnetToolReference + DotnetToolsLayoutDirectory=$(testAssetSourceRoot) diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index 89d74d82f..632a1cc36 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs @@ -304,7 +304,7 @@ namespace Microsoft.DotNet.Tests result.Should().NotBeNull(); - result.Args.Should().Contain("--fx-version 2.1.0"); + result.Args.Should().Contain("--fx-version 2.1.1"); } [Fact] diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj index 51f9ce940..4d006484a 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj @@ -54,8 +54,7 @@ TemplateFillInPackageName=dotnet-watch; TemplateFillInPackageVersion=$(DotnetWatchPackageVersion); PreviousStageDirectory=$(PreviousStageDirectory); - DotnetToolsLayoutDirectory=$(testAssetSourceRoot); - DotnetToolsRestoreProjectStyle=DotnetToolReference + DotnetToolsLayoutDirectory=$(testAssetSourceRoot) diff --git a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs index bb2c148f5..cb9d8135e 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs @@ -75,8 +75,7 @@ namespace Microsoft.DotNet.New.Tests } [Theory] - [InlineData("console", "microsoft.netcore.app")] - // re-enable when this bug is resolved: https://github.com/dotnet/cli/issues/7574 + // [InlineData("console", "microsoft.netcore.app")] re-enable when this issue is resolved: "https://github.com/dotnet/cli/issues/9420" [InlineData("classlib", "netstandard.library")] public void NewProjectRestoresCorrectPackageVersion(string type, string packageName) { @@ -107,7 +106,7 @@ namespace Microsoft.DotNet.New.Tests var sharedFxDir = dotnetDir .GetDirectory("shared", "Microsoft.NETCore.App") .EnumerateDirectories() - .Single(d => d.Name.StartsWith("2.1.0")); + .Single(d => d.Name.StartsWith("2.1.1")); if (packageName == "microsoft.netcore.app") {