Skip to content

Commit

Permalink
Merge pull request #767 from dagood/2.1.4
Browse files Browse the repository at this point in the history 
Merge v2.1.4-ga, v2.1.402-SDK-ga into release/2.1
  • Loading branch information
@dagood
dagood committed Sep 12, 2018
2 parents a5a033b + 28714a8 commit 5d43325
Show file tree
Hide file tree
Showing 15 changed files with 33 additions and 32 deletions.
2 changes: 1 addition & 1 deletion ProdConFeed.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180725-02/final/index.json
https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180814-02/final/index.json
4 changes: 2 additions & 2 deletions dependencies.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
the product as version strings to be used by the SDK to fetch extra content.
-->
<PropertyGroup>
<MicrosoftAspNetCoreAllPackageVersion>2.1.3</MicrosoftAspNetCoreAllPackageVersion>
<MicrosoftAspNetCoreAppPackageVersion>2.1.3</MicrosoftAspNetCoreAppPackageVersion>
<MicrosoftAspNetCoreAllPackageVersion>2.1.4</MicrosoftAspNetCoreAllPackageVersion>
<MicrosoftAspNetCoreAppPackageVersion>2.1.4</MicrosoftAspNetCoreAppPackageVersion>
<MicrosoftNETSdkRazorPackageVersion>2.1.2</MicrosoftNETSdkRazorPackageVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion dir.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<ToolPackageExtractDir>$(ToolsDir)source-built/</ToolPackageExtractDir>
<ToolsLocalDir>$(ProjectDir)tools-local/</ToolsLocalDir>
<TaskDirectory>$(ToolsLocalDir)tasks/</TaskDirectory>
<TasksBinDir>$(TaskDirectory)Microsoft.DotNet.SourceBuild.Tasks/bin/Debug/netstandard2.0/</TasksBinDir>
<TasksBinDir>$(TaskDirectory)Microsoft.DotNet.SourceBuild.Tasks/bin/Debug/netstandard1.5/</TasksBinDir>
<BaseIntermediatePath>$(BaseOutputPath)obj/</BaseIntermediatePath>
<OutputPath>$(BaseOutputPath)$(Platform)/$(Configuration)/</OutputPath>
<IntermediatePath>$(BaseIntermediatePath)$(Platform)/$(Configuration)/</IntermediatePath>
Expand Down
2 changes: 1 addition & 1 deletion repos/core-setup.proj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<BuildArguments Condition="$(Platform.Contains('arm'))">$(BuildArguments) -TargetArchitecture=$(Platform) -DisableCrossgen=true -CrossBuild=true</BuildArguments>
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) -- /p:BuildDebPackage=false /p:BuildAllPackages=true</BuildCommand>
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
<OfficialBuildId>20180725-05</OfficialBuildId>
<OfficialBuildId>20180814-02</OfficialBuildId>

<!-- Need to set $(PackagesOutput) so WriteVersions writes the versions file for cli, until cli respects auto-dependency flow -->
<PackagesOutput>$(SourceBuiltPackagesPath)</PackagesOutput>
Expand Down
2 changes: 1 addition & 1 deletion repos/coreclr.proj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) --</BuildCommand>
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
<OfficialBuildId>20180725-06</OfficialBuildId>
<OfficialBuildId>20180814-03</OfficialBuildId>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion repos/corefx.proj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
<PackagesOutput>$(ProjectDirectory)/bin/packages/$(Configuration)</PackagesOutput>
<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
<OfficialBuildId>20180725-05</OfficialBuildId>
<OfficialBuildId>20180814-02</OfficialBuildId>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/cli
Submodule cli updated 9 files
+3 −1 TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
+2 −0 build/BuildDefaults.props
+1 −1 build/DependencyVersions.props
+1 −0 build/NugetConfigFile.targets
+1 −1 build/Version.props
+15 −14 build/package/Installer.DEB.proj
+2 −1 build/package/Installer.RPM.targets
+1 −1 build/publish/PublishNupkgToBlobFeed.targets
+32 −1 build_projects/dotnet-cli-build/Crossgen.cs
2 changes: 1 addition & 1 deletion src/core-setup
Submodule core-setup updated 3 files
+1 −1 BranchInfo.props
+5 −5 dependencies.props
+1 −1 dir.props
2 changes: 1 addition & 1 deletion src/coreclr
Submodule coreclr updated 10 files
+1 −1 ILAsmVersion.txt
+7 −7 dependencies.props
+1 −1 src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props
+3 −0 src/.nuget/dir.props
+11 −0 src/build.proj
+12 −0 src/jit/lclvars.cpp
+6 −0 src/sign.builds
+2 −1 tests/src/Common/test_dependencies/test_dependencies.csproj
+249 −0 tests/src/JIT/Regression/JitBlue/GitHub_19149/GitHub_19149.cs
+35 −0 tests/src/JIT/Regression/JitBlue/GitHub_19149/GitHub_19149.csproj
2 changes: 1 addition & 1 deletion src/corefx
Submodule corefx updated 19 files
+1 −1 buildpipeline/DotNet-CoreFx-Trusted-Linux.json
+2 −2 buildpipeline/README.md
+2 −2 buildpipeline/linux.groovy
+1 −1 buildpipeline/pipeline.json
+8 −0 dir.props
+2 −2 external/harvestPackages/harvestPackages.depproj
+140 −49 external/harvestPackages/harvestPackages.props
+13 −7 pkg/Microsoft.Private.PackageBaseline/packageIndex.json
+3 −0 src/System.IO.Pipelines/pkg/System.IO.Pipelines.pkgproj
+15 −3 src/System.IO.Pipelines/src/System/IO/Pipelines/Pipe.cs
+21 −0 src/System.IO.Pipelines/tests/ReadAsyncCancellationTests.cs
+0 −1 src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionPool.cs
+12 −1 src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpEnvironmentProxy.cs
+6 −0 src/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpSystemProxy.cs
+16 −2 src/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.cs
+2 −0 src/System.Net.Http/tests/UnitTests/HttpEnvironmentProxyTest.cs
+23 −1 src/System.Net.Http/tests/UnitTests/HttpSystemProxyTest.cs
+12 −1 src/System.Net.Requests/src/System/Net/HttpWebRequest.cs
+1 −10 src/packages.builds
2 changes: 1 addition & 1 deletion src/standard
Submodule standard updated 8 files
+1 −0 Packaging.props
+1 −1 apicompat/baselines/ApiCompatBaseline.portable4.0-Profile3.txt
+1 −1 apicompat/baselines/ApiCompatBaseline.portable4.0-Profile344.txt
+1 −1 apicompat/baselines/ApiCompatBaseline.portable4.0-Profile42.txt
+2 −3 buildpipeline/dotnet-standard-win.json
+2 −2 netstandard/pkg/NETStandard.Library.pkgproj
+26 −20 netstandard/pkg/targets/netstandard/NETStandard.Library.targets
+3 −1 pkg/baseline/packageIndex.json
2 changes: 1 addition & 1 deletion src/websdk
Submodule websdk updated from ec804d to 95a0c3
17 changes: 8 additions & 9 deletions tools-local/prebuilt-baseline-offline.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,9 @@
<Usage Id="Microsoft.DotNet.PlatformAbstractions" Version="2.0.4" />
<Usage Id="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0-preview2-26306-03" />
<Usage Id="Microsoft.DotNet.VersionTools" Version="2.1.0-prerelease-02430-04" />
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.1.3" />
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.3" />
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="2.1.3" />
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.1.4" />
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.4" />
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="2.1.4" />
<Usage Id="Microsoft.Extensions.CommandLineUtils" Version="1.1.0" />
<Usage Id="Microsoft.Extensions.DependencyModel" Version="1.0.0" />
<Usage Id="Microsoft.Extensions.DependencyModel" Version="1.0.3" />
Expand Down Expand Up @@ -174,8 +174,8 @@
<Usage Id="Microsoft.NETCore.Platforms" Version="2.0.0" />
<Usage Id="Microsoft.NETCore.Platforms" Version="2.1.0-preview1-26116-01" />
<Usage Id="Microsoft.NETCore.Platforms" Version="2.1.0-preview2-26406-04" />
<Usage Id="Microsoft.NETCore.Platforms" Version="2.1.1-servicing-26719-03" />
<Usage Id="Microsoft.NETCore.Platforms" Version="2.1.1-servicing-26722-02" />
<Usage Id="Microsoft.NETCore.Platforms" Version="2.1.1" />
<Usage Id="Microsoft.NETCore.Runtime.CoreCLR" Version="1.0.5" />
<Usage Id="Microsoft.NETCore.Runtime.CoreCLR" Version="1.0.7" />
<Usage Id="Microsoft.NETCore.Runtime.CoreCLR" Version="1.1.1" />
Expand Down Expand Up @@ -219,7 +219,6 @@
<Usage Id="NETStandard.Library" Version="1.6.1" />
<Usage Id="NETStandard.Library" Version="2.0.0" />
<Usage Id="NETStandard.Library" Version="2.0.1" />
<Usage Id="NETStandard.Library" Version="2.0.3" />
<Usage Id="NETStandard.Library.NETFramework" Version="2.0.1-servicing-26011-01" />
<Usage Id="Newtonsoft.Json" Version="6.0.4" />
<Usage Id="Newtonsoft.Json" Version="8.0.3" />
Expand Down Expand Up @@ -258,10 +257,10 @@
<Usage Id="NuGet.Versioning" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
<Usage Id="NUnit3.DotNetNew.Template" Version="1.5.1" />
<Usage Id="OpenCover" Version="4.6.519" />
<Usage Id="optimization.linux-x64.PGO.CoreCLR" Version="2.1.0-release-20180720-0153" />
<Usage Id="optimization.PGO.CoreCLR" Version="2.1.0-release-20180720-0153" />
<Usage Id="optimization.windows_nt-x64.PGO.CoreCLR" Version="2.1.0-release-20180720-0153" />
<Usage Id="optimization.windows_nt-x86.PGO.CoreCLR" Version="2.1.0-release-20180720-0153" />
<Usage Id="optimization.linux-x64.PGO.CoreCLR" Version="2.1.0-release-20180725-0038" />
<Usage Id="optimization.PGO.CoreCLR" Version="2.1.0-release-20180725-0038" />
<Usage Id="optimization.windows_nt-x64.PGO.CoreCLR" Version="2.1.0-release-20180725-0038" />
<Usage Id="optimization.windows_nt-x86.PGO.CoreCLR" Version="2.1.0-release-20180725-0038" />
<Usage Id="ReportGenerator" Version="3.0.1" />
<Usage Id="runtime.any.System.Collections" Version="4.0.11" Rid="any" />
<Usage Id="runtime.any.System.Collections" Version="4.3.0" Rid="any" />
Expand Down
17 changes: 8 additions & 9 deletions tools-local/prebuilt-baseline-online.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@
<Usage Id="Microsoft.DotNet.PlatformAbstractions" Version="2.0.4" />
<Usage Id="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0-preview2-26306-03" />
<Usage Id="Microsoft.DotNet.VersionTools" Version="2.1.0-prerelease-02430-04" />
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.1.3" />
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.3" />
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="2.1.3" />
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.1.4" />
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.4" />
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates" Version="2.1.4" />
<Usage Id="Microsoft.Extensions.CommandLineUtils" Version="1.1.0" />
<Usage Id="Microsoft.Extensions.DependencyModel" Version="1.0.0" />
<Usage Id="Microsoft.Extensions.DependencyModel" Version="1.0.3" />
Expand Down Expand Up @@ -166,8 +166,8 @@
<Usage Id="Microsoft.NETCore.Platforms" Version="2.0.0" />
<Usage Id="Microsoft.NETCore.Platforms" Version="2.1.0-preview1-26116-01" />
<Usage Id="Microsoft.NETCore.Platforms" Version="2.1.0-preview2-26406-04" />
<Usage Id="Microsoft.NETCore.Platforms" Version="2.1.1-servicing-26719-03" />
<Usage Id="Microsoft.NETCore.Platforms" Version="2.1.1-servicing-26722-02" />
<Usage Id="Microsoft.NETCore.Platforms" Version="2.1.1" />
<Usage Id="Microsoft.NETCore.Runtime.CoreCLR" Version="1.0.5" />
<Usage Id="Microsoft.NETCore.Runtime.CoreCLR" Version="1.0.7" />
<Usage Id="Microsoft.NETCore.Runtime.CoreCLR" Version="1.1.1" />
Expand Down Expand Up @@ -212,7 +212,6 @@
<Usage Id="NETStandard.Library" Version="1.6.1" />
<Usage Id="NETStandard.Library" Version="2.0.0" />
<Usage Id="NETStandard.Library" Version="2.0.1" />
<Usage Id="NETStandard.Library" Version="2.0.3" />
<Usage Id="NETStandard.Library.NETFramework" Version="2.0.1-servicing-26011-01" />
<Usage Id="Newtonsoft.Json" Version="6.0.4" />
<Usage Id="Newtonsoft.Json" Version="8.0.3" />
Expand Down Expand Up @@ -251,10 +250,10 @@
<Usage Id="NuGet.Versioning" Version="4.7.0-rtm.5148+9245481f357ae542f92e6bc5e504fc898cfe5fc0" />
<Usage Id="NUnit3.DotNetNew.Template" Version="1.5.1" />
<Usage Id="OpenCover" Version="4.6.519" />
<Usage Id="optimization.linux-x64.PGO.CoreCLR" Version="2.1.0-release-20180720-0153" />
<Usage Id="optimization.PGO.CoreCLR" Version="2.1.0-release-20180720-0153" />
<Usage Id="optimization.windows_nt-x64.PGO.CoreCLR" Version="2.1.0-release-20180720-0153" />
<Usage Id="optimization.windows_nt-x86.PGO.CoreCLR" Version="2.1.0-release-20180720-0153" />
<Usage Id="optimization.linux-x64.PGO.CoreCLR" Version="2.1.0-release-20180725-0038" />
<Usage Id="optimization.PGO.CoreCLR" Version="2.1.0-release-20180725-0038" />
<Usage Id="optimization.windows_nt-x64.PGO.CoreCLR" Version="2.1.0-release-20180725-0038" />
<Usage Id="optimization.windows_nt-x86.PGO.CoreCLR" Version="2.1.0-release-20180725-0038" />
<Usage Id="ReportGenerator" Version="3.0.1" />
<Usage Id="RoslynTools.RepoToolset" Version="1.0.0-beta2-62805-03" />
<Usage Id="runtime.any.System.Collections" Version="4.0.11" Rid="any" />
Expand Down
5 changes: 4 additions & 1 deletion ...-local/tasks/Microsoft.DotNet.SourceBuild.Tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))/dir.props" />
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netstandard1.5</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<CoreSetupPlatformAbstractionsPath>$(SubmoduleDirectory)core-setup/src/managed/Microsoft.DotNet.PlatformAbstractions/</CoreSetupPlatformAbstractionsPath>
<OutputPath>$(MSBuildThisFileDirectory)bin/$(Configuration)</OutputPath>
Expand All @@ -27,6 +27,9 @@
<PackageReference Include="Microsoft.Build.Utilities.Core">
<Version>15.6.82</Version>
</PackageReference>
<PackageReference Include="System.ValueTuple">
<Version>4.4.0</Version>
</PackageReference>
</ItemGroup>

<!--
Expand Down

0 comments on commit 5d43325

Please sign in to comment.