diff --git a/ProdConFeed.txt b/ProdConFeed.txt index 2f6aa82889..3542f9b399 100644 --- a/ProdConFeed.txt +++ b/ProdConFeed.txt @@ -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 diff --git a/dependencies.props b/dependencies.props index f9f0a78005..2e33eb7f62 100644 --- a/dependencies.props +++ b/dependencies.props @@ -28,8 +28,8 @@ the product as version strings to be used by the SDK to fetch extra content. --> - 2.1.3 - 2.1.3 + 2.1.4 + 2.1.4 2.1.2 diff --git a/dir.props b/dir.props index 9fbf6aa323..9f6f8e636e 100644 --- a/dir.props +++ b/dir.props @@ -46,7 +46,7 @@ $(ToolsDir)source-built/ $(ProjectDir)tools-local/ $(ToolsLocalDir)tasks/ - $(TaskDirectory)Microsoft.DotNet.SourceBuild.Tasks/bin/Debug/netstandard2.0/ + $(TaskDirectory)Microsoft.DotNet.SourceBuild.Tasks/bin/Debug/netstandard1.5/ $(BaseOutputPath)obj/ $(BaseOutputPath)$(Platform)/$(Configuration)/ $(BaseIntermediatePath)$(Platform)/$(Configuration)/ diff --git a/repos/core-setup.proj b/repos/core-setup.proj index ce674259c1..19614076bc 100644 --- a/repos/core-setup.proj +++ b/repos/core-setup.proj @@ -6,7 +6,7 @@ $(BuildArguments) -TargetArchitecture=$(Platform) -DisableCrossgen=true -CrossBuild=true $(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) -- /p:BuildDebPackage=false /p:BuildAllPackages=true $(ArmEnvironmentVariables) $(BuildCommand) - 20180725-05 + 20180814-02 $(SourceBuiltPackagesPath) diff --git a/repos/coreclr.proj b/repos/coreclr.proj index 56317690df..78979ca750 100644 --- a/repos/coreclr.proj +++ b/repos/coreclr.proj @@ -10,7 +10,7 @@ $(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) -- $(ArmEnvironmentVariables) $(BuildCommand) $(ProjectDirectory)/clean$(ShellExtension) - 20180725-06 + 20180814-03 diff --git a/repos/corefx.proj b/repos/corefx.proj index a501f27452..2ebbd7756a 100644 --- a/repos/corefx.proj +++ b/repos/corefx.proj @@ -7,7 +7,7 @@ $(ArmEnvironmentVariables) $(BuildCommand) $(ProjectDirectory)/bin/packages/$(Configuration) $(ProjectDirectory)/clean$(ShellExtension) - 20180725-05 + 20180814-02 diff --git a/src/cli b/src/cli index 91b1c13032..5b8776a9a4 160000 --- a/src/cli +++ b/src/cli @@ -1 +1 @@ -Subproject commit 91b1c13032bde003ffeca3d1ff3310fbbae7c428 +Subproject commit 5b8776a9a416d531c61dedacfb302121f9c86f85 diff --git a/src/core-setup b/src/core-setup index 124038c13e..85255dde3e 160000 --- a/src/core-setup +++ b/src/core-setup @@ -1 +1 @@ -Subproject commit 124038c13eafa08e4bd8c2bfd04bb0633f958bc8 +Subproject commit 85255dde3ecd86987236868a0415acd3265258d2 diff --git a/src/coreclr b/src/coreclr index 8a2b245831..6ddb33afcf 160000 --- a/src/coreclr +++ b/src/coreclr @@ -1 +1 @@ -Subproject commit 8a2b2458317ccbca71672541936e73ef4c5df90f +Subproject commit 6ddb33afcf50380f37ac7a39b9b0d13533d7ac17 diff --git a/src/corefx b/src/corefx index 6c6b536dff..96925bba13 160000 --- a/src/corefx +++ b/src/corefx @@ -1 +1 @@ -Subproject commit 6c6b536dffb4da0c45ff14921bfee10265265050 +Subproject commit 96925bba1377b6042fc7322564b600a4e651f7fd diff --git a/src/standard b/src/standard index bb2c2cb47d..18a36291e4 160000 --- a/src/standard +++ b/src/standard @@ -1 +1 @@ -Subproject commit bb2c2cb47d21d12477f5af6f68ab9d698b6e245f +Subproject commit 18a36291e48808fa7ef2d00a764ceb1ec95645a5 diff --git a/src/websdk b/src/websdk index ec804d630e..95a0c34806 160000 --- a/src/websdk +++ b/src/websdk @@ -1 +1 @@ -Subproject commit ec804d630e9c297e34011d674f28b7f66f06fe96 +Subproject commit 95a0c34806e574f7fdda79f3506f754101f6ae7f diff --git a/tools-local/prebuilt-baseline-offline.xml b/tools-local/prebuilt-baseline-offline.xml index 15ddc38971..baba57e57b 100644 --- a/tools-local/prebuilt-baseline-offline.xml +++ b/tools-local/prebuilt-baseline-offline.xml @@ -115,9 +115,9 @@ - - - + + + @@ -174,8 +174,8 @@ - + @@ -219,7 +219,6 @@ - @@ -258,10 +257,10 @@ - - - - + + + + diff --git a/tools-local/prebuilt-baseline-online.xml b/tools-local/prebuilt-baseline-online.xml index e55543ce5e..78d135ff64 100644 --- a/tools-local/prebuilt-baseline-online.xml +++ b/tools-local/prebuilt-baseline-online.xml @@ -104,9 +104,9 @@ - - - + + + @@ -166,8 +166,8 @@ - + @@ -212,7 +212,6 @@ - @@ -251,10 +250,10 @@ - - - - + + + + diff --git a/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj b/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj index 5473d3d031..676a6f0607 100755 --- a/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj +++ b/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj @@ -5,7 +5,7 @@ - netstandard2.0 + netstandard1.5 true $(SubmoduleDirectory)core-setup/src/managed/Microsoft.DotNet.PlatformAbstractions/ $(MSBuildThisFileDirectory)bin/$(Configuration) @@ -27,6 +27,9 @@ 15.6.82 + + 4.4.0 +