Skip to content

Commit 2e2d89a

Browse files
surayya-MSsurayya-MS
authored
[vs17.8] Merge tag v17.8.29 (#11866)
Fixes # ### Context ### Changes Made ### Testing ### Notes
2 parents 65a6534 + b1d27f0 commit 2e2d89a

File tree

16 files changed

+56
-132
lines changed

16 files changed

+56
-132
lines changed

‎eng/Packages.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<PackageVersion Include="NuGet.Frameworks" Version="$(NuGetBuildTasksVersion)" />
2020
<PackageVersion Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
2121
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
22-
<PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
2322
<PackageVersion Include="System.Memory" Version="$(SystemMemoryVersion)" />
2423
<PackageVersion Include="System.Net.Http" Version="$(SystemNetHttpVersion)" />
2524
<PackageVersion Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />

‎eng/SourceBuildPrebuiltBaseline.xml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,13 @@
44
<UsageData>
55
<IgnorePatterns>
66
<UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />
7-
<UsagePattern IdentityGlob="System.Formats.Asn1/*8.0.1*" />
8-
<UsagePattern IdentityGlob="System.Collections.Immutable/*8.0.0*" />
9-
107
<!-- Baseline 7.0 dependencies until msbuild targets net8 and uses a net8 arcade, SBRP, etc.
118
These cannot be added to 7.0 SBRP, because they would are produced in the 7.0 build. -->
129
<UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/*7.0.0*" />
1310
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/*7.0.0*" />
1411
<UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/*7.0.0*" />
1512
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*7.0.0*" />
16-
<UsagePattern IdentityGlob="System.Text.Json/*8.0.5*" />
13+
<UsagePattern IdentityGlob="System.Text.Json/*7.0.3*" />
1714
</IgnorePatterns>
1815
<Usages>
1916
</Usages>

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
<!-- Necessary for source-build due to being a transitive dependency of System.Reflection.MetadataLoadContext.
1515
This allows the package to be retrieved from previously-source-built artifacts and flow in as dependencies
1616
of the packages produced by msbuild. -->
17-
<Dependency Name="System.Collections.Immutable" Version="8.0.0">
18-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
19-
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
17+
<Dependency Name="System.Collections.Immutable" Version="7.0.0">
18+
<Uri>https://github.com/dotnet/runtime</Uri>
19+
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
2020
</Dependency>
2121
<!-- Necessary for source-build. This allows the package to be retrieved from previously-source-built artifacts
2222
and flow in as dependencies of the packages produced by msbuild. -->
@@ -52,17 +52,13 @@
5252
<Uri>https://github.com/dotnet/runtime</Uri>
5353
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
5454
</Dependency>
55-
<Dependency Name="System.Text.Json" Version="8.0.5">
56-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
57-
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
58-
</Dependency>
59-
<Dependency Name="System.Formats.Asn1" Version="8.0.1">
60-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
61-
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
55+
<Dependency Name="System.Text.Json" Version="7.0.3">
56+
<Uri>https://github.com/dotnet/runtime</Uri>
57+
<Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
6258
</Dependency>
6359
</ProductDependencies>
6460
<ToolsetDependencies>
65-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25208.7">
61+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25208.7">
6662
<Uri>https://github.com/dotnet/arcade</Uri>
6763
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
6864
<SourceBuild RepoName="arcade" ManagedOnly="true" />
@@ -86,4 +82,4 @@
8682
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
8783
</Dependency>
8884
</ToolsetDependencies>
89-
</Dependencies>
85+
</Dependencies>

‎eng/Versions.props‎

Lines changed: 4 additions & 5 deletions
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.26</VersionPrefix>
5+
<VersionPrefix>17.8.29</VersionPrefix>
66
<DotNetFinalVersionKind>release</DotNetFinalVersionKind>
77
<PackageValidationBaselineVersion>17.7.0</PackageValidationBaselineVersion>
88
<AssemblyVersion>15.1.0.0</AssemblyVersion>
@@ -27,9 +27,8 @@
2727
</PropertyGroup>
2828
<!-- Production Dependencies -->
2929
<PropertyGroup>
30-
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
30+
<SystemCollectionsImmutableVersion>7.0.0</SystemCollectionsImmutableVersion>
3131
<SystemConfigurationConfigurationManagerVersion>7.0.0</SystemConfigurationConfigurationManagerVersion>
32-
<SystemFormatsAsn1Version>8.0.1</SystemFormatsAsn1Version>
3332
<!--
3433
Modifying the version of System.Memory is very high impact and causes downstream breaks in third-party tooling that uses the MSBuild API.
3534
When updating the version of System.Memory file a breaking change here: https://github.com/dotnet/docs/issues/new?assignees=gewarren&labels=breaking-change%2CPri1%2Cdoc-idea&template=breaking-change.yml&title=%5BBreaking+change%5D%3A+
@@ -51,11 +50,11 @@
5150
<MicrosoftCodeAnalysisCollectionsVersion>4.2.0-1.22102.8</MicrosoftCodeAnalysisCollectionsVersion>
5251
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25208.7</MicrosoftDotNetXUnitExtensionsVersion>
5352
<MicrosoftExtensionsDependencyModelVersion>7.0.0</MicrosoftExtensionsDependencyModelVersion>
54-
<MicrosoftIORedistVersion>6.0.1</MicrosoftIORedistVersion>
53+
<MicrosoftIORedistVersion>6.0.0</MicrosoftIORedistVersion>
5554
<MicrosoftNetCompilersToolsetVersion>4.8.0-3.23465.5</MicrosoftNetCompilersToolsetVersion>
5655
<NuGetBuildTasksVersion>6.8.0-rc.112</NuGetBuildTasksVersion>
5756
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
58-
<SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
57+
<SystemTextJsonVersion>7.0.3</SystemTextJsonVersion>
5958
<SystemThreadingTasksDataflowVersion>7.0.0</SystemThreadingTasksDataflowVersion>
6059
</PropertyGroup>
6160
<Target Name="OverrideArcadeFileVersion" AfterTargets="_InitializeAssemblyVersion">

‎eng/cibuild_bootstrapped_msbuild.ps1‎

Lines changed: 1 addition & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -64,67 +64,11 @@ try {
6464

6565
if ($buildStage1)
6666
{
67-
& $PSScriptRoot\Common\Build.ps1 -restore -build -ci -msbuildEngine $msbuildEngine /p:CreateBootstrap=true @properties
67+
& $PSScriptRoot\Common\Build.ps1 -restore -build -test -ci -msbuildEngine $msbuildEngine /p:CreateBootstrap=true @properties
6868
}
6969

7070
KillProcessesFromRepo
7171

72-
$bootstrapRoot = Join-Path $Stage1BinDir "bootstrap"
73-
74-
# we need to do this to guarantee we have/know where dotnet.exe is installed
75-
$dotnetToolPath = InitializeDotNetCli $true
76-
$dotnetExePath = Join-Path $dotnetToolPath "dotnet.exe"
77-
78-
if ($msbuildEngine -eq 'vs')
79-
{
80-
$buildToolPath = Join-Path $bootstrapRoot "net472\MSBuild\Current\Bin\MSBuild.exe"
81-
$buildToolCommand = "";
82-
$buildToolFramework = "net472"
83-
84-
if ($configuration -eq "Debug-MONO" -or $configuration -eq "Release-MONO")
85-
{
86-
# Copy MSBuild.dll to MSBuild.exe so we can run it without a host
87-
$sourceDll = Join-Path $bootstrapRoot "net472\MSBuild\Current\Bin\MSBuild.dll"
88-
Copy-Item -Path $sourceDll -Destination $msbuildToUse
89-
}
90-
}
91-
else
92-
{
93-
$buildToolPath = $dotnetExePath
94-
$buildToolCommand = Join-Path $bootstrapRoot "net8.0\MSBuild\MSBuild.dll"
95-
$buildToolFramework = "net8.0"
96-
}
97-
98-
# Use separate artifacts folder for stage 2
99-
# $env:ArtifactsDir = Join-Path $ArtifactsDir "2\"
100-
101-
& $dotnetExePath build-server shutdown
102-
103-
if ($buildStage1)
104-
{
105-
if (Test-Path $Stage1Dir)
106-
{
107-
Remove-Item -Force -Recurse $Stage1Dir
108-
}
109-
110-
Move-Item -Path $ArtifactsDir -Destination $Stage1Dir -Force
111-
}
112-
113-
$buildTool = @{ Path = $buildToolPath; Command = $buildToolCommand; Tool = $msbuildEngine; Framework = $buildToolFramework }
114-
$global:_BuildTool = $buildTool
115-
116-
# Ensure that debug bits fail fast, rather than hanging waiting for a debugger attach.
117-
$env:MSBUILDDONOTLAUNCHDEBUGGER="true"
118-
119-
# Opt into performance logging. https://github.com/dotnet/msbuild/issues/5900
120-
$env:DOTNET_PERFLOG_DIR=$PerfLogDir
121-
122-
# When using bootstrapped MSBuild:
123-
# - Turn off node reuse (so that bootstrapped MSBuild processes don't stay running and lock files)
124-
# - Do run tests
125-
# - Don't try to create a bootstrap deployment
126-
& $PSScriptRoot\Common\Build.ps1 -restore -build -test -ci /p:CreateBootstrap=false /nr:false @properties
127-
12872
exit $lastExitCode
12973
}
13074
catch {

‎eng/cibuild_bootstrapped_msbuild.sh‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ fi
5555

5656
if [[ $build_stage1 == true ]];
5757
then
58-
/bin/bash "$ScriptRoot/common/build.sh" --restore --build --ci --configuration $configuration /p:CreateBootstrap=true $properties $extra_properties || exit $?
58+
/bin/bash "$ScriptRoot/common/build.sh" --restore --build --ci --test --configuration $configuration /p:CreateBootstrap=false $properties $extra_properties || exit $?
5959
fi
6060

6161
bootstrapRoot="$Stage1Dir/bin/bootstrap"
@@ -93,9 +93,3 @@ export DOTNET_PERFLOG_DIR=$PerfLogDir
9393
# Prior to 3.0, the Csc task uses this environment variable to decide whether to run
9494
# a CLI host or directly execute the compiler.
9595
export DOTNET_HOST_PATH="$_InitializeDotNetCli/dotnet"
96-
97-
# When using bootstrapped MSBuild:
98-
# - Turn off node reuse (so that bootstrapped MSBuild processes don't stay running and lock files)
99-
# - Do run tests
100-
# - Don't try to create a bootstrap deployment
101-
. "$ScriptRoot/common/build.sh" --restore --build --test --ci --nodereuse false --configuration $configuration /p:CreateBootstrap=false $properties $extra_properties

‎eng/common/templates-official/job/source-build.yml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎eng/common/templates/job/source-build.yml‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Build.UnitTests/BackEnd/MSBuild_Tests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ public void LogErrorWhenBuildingVCProj()
412412
/// However, it's a situation where the project author doesn't have control over the
413413
/// property value and so he can't escape it himself.
414414
/// </summary>
415-
[Fact]
415+
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/11888")]
416416
public void PropertyOverridesContainSemicolon()
417417
{
418418
ObjectModelHelpers.DeleteTempProjectDirectory();

‎src/Build.UnitTests/EscapingInProjects_Tests.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -957,7 +957,7 @@ public FullProjectsUsingMicrosoftCommonTargets(ITestOutputHelper output)
957957
/// <summary>
958958
/// ESCAPING: Escaping in conditionals is broken.
959959
/// </summary>
960-
[Fact]
960+
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/11888")]
961961
public void SemicolonInConfiguration()
962962
{
963963
ObjectModelHelpers.DeleteTempProjectDirectory();
@@ -1017,7 +1017,7 @@ public class Class1
10171017
/// <summary>
10181018
/// ESCAPING: Escaping in conditionals is broken.
10191019
/// </summary>
1020-
[Fact]
1020+
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/11888")]
10211021
public void SemicolonInConfiguration_UsingTaskHost()
10221022
{
10231023
string originalOverrideTaskHostVariable = Environment.GetEnvironmentVariable("MSBUILDFORCEALLTASKSOUTOFPROC");
@@ -1087,7 +1087,7 @@ public class Class1
10871087
/// <summary>
10881088
/// ESCAPING: CopyBuildTarget target fails if the output assembly name contains a semicolon or single-quote
10891089
/// </summary>
1090-
[Fact]
1090+
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/11888")]
10911091
public void SemicolonInAssemblyName()
10921092
{
10931093
ObjectModelHelpers.DeleteTempProjectDirectory();
@@ -1142,7 +1142,7 @@ public class Class1
11421142
/// <summary>
11431143
/// ESCAPING: CopyBuildTarget target fails if the output assembly name contains a semicolon or single-quote
11441144
/// </summary>
1145-
[Fact]
1145+
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/11888")]
11461146
public void SemicolonInAssemblyName_UsingTaskHost()
11471147
{
11481148
string originalOverrideTaskHostVariable = Environment.GetEnvironmentVariable("MSBUILDFORCEALLTASKSOUTOFPROC");
@@ -1207,7 +1207,7 @@ public class Class1
12071207
/// <summary>
12081208
/// ESCAPING: Conversion Issue: Properties with $(xxx) as literals are not being converted correctly
12091209
/// </summary>
1210-
[Fact]
1210+
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/11888")]
12111211
public void DollarSignInAssemblyName()
12121212
{
12131213
ObjectModelHelpers.DeleteTempProjectDirectory();
@@ -1262,7 +1262,7 @@ public class Class1
12621262
/// <summary>
12631263
/// ESCAPING: Conversion Issue: Properties with $(xxx) as literals are not being converted correctly
12641264
/// </summary>
1265-
[Fact]
1265+
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/11888")]
12661266
public void DollarSignInAssemblyName_UsingTaskHost()
12671267
{
12681268
string originalOverrideTaskHostVariable = Environment.GetEnvironmentVariable("MSBUILDFORCEALLTASKSOUTOFPROC");
@@ -1327,7 +1327,7 @@ public class Class1
13271327
/// <summary>
13281328
/// This is the case when one of the source code files in the project has a filename containing a semicolon.
13291329
/// </summary>
1330-
[Fact]
1330+
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/11888")]
13311331
public void SemicolonInSourceCodeFilename()
13321332
{
13331333
ObjectModelHelpers.DeleteTempProjectDirectory();
@@ -1382,7 +1382,7 @@ public class Class1
13821382
/// <summary>
13831383
/// This is the case when one of the source code files in the project has a filename containing a semicolon.
13841384
/// </summary>
1385-
[Fact]
1385+
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/11888")]
13861386
public void SemicolonInSourceCodeFilename_UsingTaskHost()
13871387
{
13881388
string originalOverrideTaskHostVariable = Environment.GetEnvironmentVariable("MSBUILDFORCEALLTASKSOUTOFPROC");

0 commit comments

Comments
 (0)