Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[vs17.8] Sync internal and public branches #10858

Merged
merged 12 commits into from
Oct 24, 2024
Merged

[vs17.8] Sync internal and public branches #10858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f83b8bd
Enable private feed references
rainersigwald May 8, 2024
43120b1
Update System.Text.Json to 8.0.4
maridematte May 6, 2024
f8398f4
Only check edited files within src folder
maridematte May 9, 2024
4ca3c76
Upgrading System.Text.Json to 8.0.4
maridematte May 9, 2024
45d98e4
fix the gap between internal/public branches
YuliiaKovalova Oct 22, 2024
3d83c89
bump the version
YuliiaKovalova Oct 22, 2024
2bcbce9
Revert "Enable private feed references"
YuliiaKovalova Oct 22, 2024
53d8c3b
remove extra changes
YuliiaKovalova Oct 22, 2024
bef8487
Merge branch 'vs17.8' into dev/ykovalova/sync_internal_public_branches
YuliiaKovalova Oct 23, 2024
ef8fa71
remove deprecated changes
YuliiaKovalova Oct 23, 2024
ca8e28b
Update Packages.props
YuliiaKovalova Oct 23, 2024
f9665ac
bump the version
YuliiaKovalova Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- 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. -->
<Project>
<PropertyGroup>
<VersionPrefix>17.8.9</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
<VersionPrefix>17.8.10</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
<PackageValidationBaselineVersion>17.7.0</PackageValidationBaselineVersion>
<AssemblyVersion>15.1.0.0</AssemblyVersion>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
Expand Down
2 changes: 1 addition & 1 deletion eng/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ function Set-OptProfVariables() {

function Check-EditedFiles() {
# Log VSTS errors for changed lines
git --no-pager diff HEAD --unified=0 --no-color --exit-code | ForEach-Object { "##vso[task.logissue type=error] $_" }
git --no-pager diff HEAD --unified=0 --no-color --exit-code -- src/ | ForEach-Object { "##vso[task.logissue type=error] $_" }
if ($LASTEXITCODE -ne 0) {
throw "##vso[task.logissue type=error] After building, there are changed files. Please build locally and include these changes in your pull request."
}
Expand Down
2 changes: 2 additions & 0 deletions src/MSBuild/MSBuild.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,8 @@
<PackageReference Include="Microsoft.BuildXL.Processes" Condition="'$(FeatureReportFileAccesses)' == 'true'" PrivateAssets="all" />
<PackageReference Include="Microsoft.IO.Redist" Condition="'$(FeatureMSIORedist)' == 'true'" />
<PackageReference Include="System.Configuration.ConfigurationManager" />
<!-- Explicitly reference STJ in .NET 8 to bump to a patched version for the deps file -->
<PackageReference Include="System.Text.Json" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(DotNetBuildFromSource)' != 'true'" />
YuliiaKovalova marked this conversation as resolved.
Show resolved Hide resolved
</ItemGroup>
<!-- Manually download this library for RoslynCodeTaskFactory.
See target AddRefAssemblies below. -->
Expand Down