Skip to content

Commit 338edd9

Browse files
[vs17.8] Sync internal and public branches (#10858)
1 parent e657d4d commit 338edd9

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
33
<Project>
44
<PropertyGroup>
5-
<VersionPrefix>17.8.9</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
5+
<VersionPrefix>17.8.10</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
66
<PackageValidationBaselineVersion>17.7.0</PackageValidationBaselineVersion>
77
<AssemblyVersion>15.1.0.0</AssemblyVersion>
88
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>

eng/build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ function Set-OptProfVariables() {
150150

151151
function Check-EditedFiles() {
152152
# Log VSTS errors for changed lines
153-
git --no-pager diff HEAD --unified=0 --no-color --exit-code | ForEach-Object { "##vso[task.logissue type=error] $_" }
153+
git --no-pager diff HEAD --unified=0 --no-color --exit-code -- src/ | ForEach-Object { "##vso[task.logissue type=error] $_" }
154154
if ($LASTEXITCODE -ne 0) {
155155
throw "##vso[task.logissue type=error] After building, there are changed files. Please build locally and include these changes in your pull request."
156156
}

src/MSBuild/MSBuild.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,8 @@
222222
<PackageReference Include="Microsoft.BuildXL.Processes" Condition="'$(FeatureReportFileAccesses)' == 'true'" PrivateAssets="all" />
223223
<PackageReference Include="Microsoft.IO.Redist" Condition="'$(FeatureMSIORedist)' == 'true'" />
224224
<PackageReference Include="System.Configuration.ConfigurationManager" />
225+
<!-- Explicitly reference STJ in .NET 8 to bump to a patched version for the deps file -->
226+
<PackageReference Include="System.Text.Json" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(DotNetBuildFromSource)' != 'true'" />
225227
</ItemGroup>
226228
<!-- Manually download this library for RoslynCodeTaskFactory.
227229
See target AddRefAssemblies below. -->

0 commit comments

Comments
 (0)