Skip to content

Commit be0bf32

Browse files
authored
Update 2.1.6 for respin (#845)
* Update ProdCon to 20181019-02-2170239 * Update non-ProdCon MSBuild and Roslyn * Disable DeterministicSourcePaths for Roslyn Works around issue with sourcelink usage. * Update prebuilt baselines
1 parent 3b1892e commit be0bf32

File tree

8 files changed

+20
-8
lines changed

8 files changed

+20
-8
lines changed

dependencies.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
for which dotnet/versions commit was last used to update the dependency.
66
-->
77
<PropertyGroup>
8-
<ProdConCurrentRef>db136a92478f1489903ef97beb905e235f5cd1da</ProdConCurrentRef>
8+
<ProdConCurrentRef>c9bc176e798111c2ad9815cc1ef79b02ea9c8e94</ProdConCurrentRef>
99
<CoreClrCurrentRef>1dbfe089b5c3537799927f6541185a8c1fd0adef</CoreClrCurrentRef>
1010
<BuildToolsCurrentRef>1dbfe089b5c3537799927f6541185a8c1fd0adef</BuildToolsCurrentRef>
1111
</PropertyGroup>

repos/msbuild.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<OfficialBuildId>20180426.1</OfficialBuildId>
88
<PackagesOutput>$(ProjectDirectory)/artifacts/$(Configuration)/packages</PackagesOutput>
99

10-
<OutputVersionArgs>/p:VersionPrefix=15.9.19</OutputVersionArgs>
10+
<OutputVersionArgs>/p:VersionPrefix=15.9.20</OutputVersionArgs>
1111
<OutputVersionArgs>$(OutputVersionArgs) /p:DisableNerdbankVersioning=true</OutputVersionArgs>
1212
<OutputVersionArgs>$(OutputVersionArgs) /p:PreReleaseVersionLabel=""</OutputVersionArgs>
1313
<OutputVersionArgs>$(OutputVersionArgs) /p:BUILD_BUILDNUMBER=$(OfficialBuildId)</OutputVersionArgs>

repos/roslyn.proj

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))/dir.props" />
44

55
<PropertyGroup>
6-
<NuGetPackageVersion>2.3.2-beta1-61921-05</NuGetPackageVersion>
6+
<NuGetPackageVersion>2.10.0-beta2-63410-10</NuGetPackageVersion>
77
<BuildNumber>20180426.3</BuildNumber>
88

99
<BuildCommandArgs>build</BuildCommandArgs>
@@ -13,6 +13,12 @@
1313
<BuildCommandArgs>$(BuildCommandArgs) /p:BuildNumber=$(BuildNumber)</BuildCommandArgs>
1414
<BuildCommandArgs>$(BuildCommandArgs) /bl:build.binlog</BuildCommandArgs>
1515

16+
<!--
17+
Work around https://github.com/dotnet/sourcelink/issues/91:
18+
error : SourceRoot items must include at least one top-level (not nested) item when DeterministicSourcePaths is true
19+
-->
20+
<BuildCommandArgs>$(BuildCommandArgs) /p:DeterministicSourcePaths=false</BuildCommandArgs>
21+
1622
<BuildCommand>$(DotnetToolCommand) $(BuildCommandArgs)</BuildCommand>
1723

1824
<PackagesOutput>$(ProjectDirectory)/Binaries/packages</PackagesOutput>

src/cli

Submodule cli updated 397 files

src/msbuild

src/roslyn

Submodule roslyn updated 2952 files

tools-local/prebuilt-baseline-offline.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<Usage Id="Microsoft.Build.Framework" Version="15.6.82" />
6363
<Usage Id="Microsoft.Build.Framework" Version="15.6.85" />
6464
<Usage Id="Microsoft.Build.Framework" Version="15.7.0-preview-000143" />
65-
<Usage Id="Microsoft.Build.Localization" Version="15.9.19" />
65+
<Usage Id="Microsoft.Build.Localization" Version="15.9.20" />
6666
<Usage Id="Microsoft.Build.Runtime" Version="15.3.409" />
6767
<Usage Id="Microsoft.Build.Tasks.Core" Version="14.3.0" />
6868
<Usage Id="Microsoft.Build.Tasks.Core" Version="15.1.1012" />
@@ -78,6 +78,7 @@
7878
<Usage Id="Microsoft.Build.Utilities.Core" Version="15.7.0-preview-000143" />
7979
<Usage Id="Microsoft.Cci" Version="4.0.0-rc3-24214-00" />
8080
<Usage Id="Microsoft.CodeAnalysis.Analyzers" Version="1.1.0" />
81+
<Usage Id="Microsoft.CodeAnalysis.Analyzers" Version="2.6.1" />
8182
<Usage Id="Microsoft.CodeAnalysis.Common" Version="1.3.0" />
8283
<Usage Id="Microsoft.CodeAnalysis.Common" Version="2.6.0-beta3-62316-02" />
8384
<Usage Id="Microsoft.CodeAnalysis.CSharp" Version="1.3.0" />
@@ -263,6 +264,7 @@
263264
<Usage Id="runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.1" Rid="ubuntu.16.10-x64" />
264265
<Usage Id="runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.2" Rid="ubuntu.16.10-x64" />
265266
<Usage Id="runtime.unix.Microsoft.Win32.Primitives" Version="4.3.0" Rid="unix" />
267+
<Usage Id="runtime.unix.System.Console" Version="4.3.0" Rid="unix" />
266268
<Usage Id="runtime.unix.System.Diagnostics.Debug" Version="4.3.0" Rid="unix" />
267269
<Usage Id="runtime.unix.System.IO.FileSystem" Version="4.3.0" Rid="unix" />
268270
<Usage Id="runtime.unix.System.Net.Primitives" Version="4.3.0" Rid="unix" />
@@ -542,6 +544,7 @@
542544
<Usage Id="WindowsAzure.Storage" Version="7.2.1" />
543545
<Usage Id="XliffTasks" Version="0.2.0-beta-000081" />
544546
<Usage Id="XliffTasks" Version="0.2.0-beta-62730-03" />
547+
<Usage Id="XliffTasks" Version="0.2.0-beta-63004-01" />
545548
<Usage Id="xunit.abstractions" Version="2.0.1-rc2" />
546549
<Usage Id="xunit.abstractions" Version="2.0.1" />
547550
<Usage Id="xunit.analyzers" Version="0.7.0" />

tools-local/prebuilt-baseline-online.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<Usage Id="Microsoft.Build.Framework" Version="15.6.82" />
5757
<Usage Id="Microsoft.Build.Framework" Version="15.6.85" />
5858
<Usage Id="Microsoft.Build.Framework" Version="15.7.0-preview-000143" />
59-
<Usage Id="Microsoft.Build.Localization" Version="15.9.19" />
59+
<Usage Id="Microsoft.Build.Localization" Version="15.9.20" />
6060
<Usage Id="Microsoft.Build.Runtime" Version="15.3.409" />
6161
<Usage Id="Microsoft.Build.Tasks.Core" Version="14.3.0" />
6262
<Usage Id="Microsoft.Build.Tasks.Core" Version="15.1.1012" />
@@ -72,6 +72,7 @@
7272
<Usage Id="Microsoft.Build.Utilities.Core" Version="15.7.0-preview-000143" />
7373
<Usage Id="Microsoft.Cci" Version="4.0.0-rc3-24214-00" />
7474
<Usage Id="Microsoft.CodeAnalysis.Analyzers" Version="1.1.0" />
75+
<Usage Id="Microsoft.CodeAnalysis.Analyzers" Version="2.6.1" />
7576
<Usage Id="Microsoft.CodeAnalysis.Common" Version="1.3.0" />
7677
<Usage Id="Microsoft.CodeAnalysis.Common" Version="2.6.0-beta3-62316-02" />
7778
<Usage Id="Microsoft.CodeAnalysis.Compilers" Version="2.6.0-beta3-62316-02" />
@@ -347,6 +348,7 @@
347348
<Usage Id="runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.1" Rid="ubuntu.16.10-x64" />
348349
<Usage Id="runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.2" Rid="ubuntu.16.10-x64" />
349350
<Usage Id="runtime.unix.Microsoft.Win32.Primitives" Version="4.3.0" Rid="unix" />
351+
<Usage Id="runtime.unix.System.Console" Version="4.3.0" Rid="unix" />
350352
<Usage Id="runtime.unix.System.Diagnostics.Debug" Version="4.3.0" Rid="unix" />
351353
<Usage Id="runtime.unix.System.IO.FileSystem" Version="4.3.0" Rid="unix" />
352354
<Usage Id="runtime.unix.System.Net.Primitives" Version="4.3.0" Rid="unix" />
@@ -664,6 +666,7 @@
664666
<Usage Id="WindowsAzure.Storage" Version="7.2.1" />
665667
<Usage Id="XliffTasks" Version="0.2.0-beta-000081" />
666668
<Usage Id="XliffTasks" Version="0.2.0-beta-62730-03" />
669+
<Usage Id="XliffTasks" Version="0.2.0-beta-63004-01" />
667670
<Usage Id="xunit" Version="2.2.0-beta2-build3300" />
668671
<Usage Id="xunit" Version="2.3.1" />
669672
<Usage Id="xunit.abstractions" Version="2.0.1-rc2" />

0 commit comments

Comments
 (0)