Skip to content

Commit fb90280

Browse files
surayya-MSsurayya-MS
authored
[vs17.10] Merge tag v17.10.29 (#11865)
Fixes # ### Context ### Changes Made ### Testing ### Notes
2 parents 323d4b3 + 37f4df2 commit fb90280

File tree

16 files changed

+46
-123
lines changed

16 files changed

+46
-123
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
<UsagePattern IdentityGlob="System.Collections.Immutable/*8.0.0*" />
99
<UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/*8.0.0*" />
1010
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/*8.0.0*" />
11-
<UsagePattern IdentityGlob="System.Formats.Asn1/*8.0.1*" />
11+
<UsagePattern IdentityGlob="System.Formats.Asn1/*8.0.0*" />
1212
<UsagePattern IdentityGlob="System.Reflection.Metadata/*8.0.0*" />
1313
<UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/*8.0.0*" />
1414
<UsagePattern IdentityGlob="System.Resources.Extensions/*8.0.0*" />
1515
<UsagePattern IdentityGlob="System.Security.Cryptography.Pkcs/*8.0.0*" />
1616
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*8.0.0*" />
1717
<UsagePattern IdentityGlob="System.Security.Cryptography.Xml/*8.0.0*" />
18-
<UsagePattern IdentityGlob="System.Text.Json/*8.0.5*" />
18+
<UsagePattern IdentityGlob="System.Text.Json/*8.0.0*" />
1919
<UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*8.0.0*" />
2020
</IgnorePatterns>
2121
<Usages>

‎eng/Version.Details.xml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
5454
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
5555
</Dependency>
56-
<Dependency Name="System.Text.Json" Version="8.0.5">
56+
<Dependency Name="System.Text.Json" Version="8.0.0">
5757
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
58-
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
58+
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
5959
</Dependency>
6060
<Dependency Name="System.Threading.Tasks.Dataflow" Version="8.0.0">
6161
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -65,10 +65,6 @@
6565
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
6666
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
6767
</Dependency>
68-
<Dependency Name="System.Formats.Asn1" Version="8.0.1">
69-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
70-
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
71-
</Dependency>
7268
</ProductDependencies>
7369
<ToolsetDependencies>
7470
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25208.7">
@@ -100,9 +96,9 @@
10096
<Sha>919d4dbfb0dffb35a702417e28ceea652d248bc6</Sha>
10197
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
10298
</Dependency>
103-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25208.7">
99+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24172.5">
104100
<Uri>https://github.com/dotnet/arcade</Uri>
105-
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
101+
<Sha>ceb071c1060b8e6de404c065b4045442570caa18</Sha>
106102
</Dependency>
107103
</ToolsetDependencies>
108-
</Dependencies>
104+
</Dependencies>

‎eng/Versions.props‎

Lines changed: 5 additions & 6 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.10.27</VersionPrefix>
5+
<VersionPrefix>17.10.29</VersionPrefix>
66
<DotNetFinalVersionKind>release</DotNetFinalVersionKind>
77
<PackageValidationBaselineVersion>17.8.3</PackageValidationBaselineVersion>
88
<AssemblyVersion>15.1.0.0</AssemblyVersion>
@@ -27,7 +27,6 @@
2727
<PropertyGroup>
2828
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
2929
<SystemConfigurationConfigurationManagerVersion>8.0.0</SystemConfigurationConfigurationManagerVersion>
30-
<SystemFormatsAsn1Version>8.0.1</SystemFormatsAsn1Version>
3130
<!--
3231
Modifying the version of System.Memory is very high impact and causes downstream breaks in third-party tooling that uses the MSBuild API.
3332
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+
@@ -40,7 +39,7 @@
4039
<SystemResourcesExtensionsVersion>8.0.0</SystemResourcesExtensionsVersion>
4140
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
4241
<SystemTextEncodingCodePagesVersion>7.0.0</SystemTextEncodingCodePagesVersion>
43-
<SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
42+
<SystemTextJsonVersion>8.0.0</SystemTextJsonVersion>
4443
<SystemThreadingChannelsVersion>8.0.0</SystemThreadingChannelsVersion>
4544
<SystemThreadingTasksDataflowVersion>8.0.0</SystemThreadingTasksDataflowVersion>
4645
</PropertyGroup>
@@ -50,9 +49,9 @@
5049
Otherwise, this version of dotnet will not be installed and the build will error out. -->
5150
<DotNetCliVersion>$([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1))</DotNetCliVersion>
5251
<MicrosoftCodeAnalysisCollectionsVersion>4.2.0-1.22102.8</MicrosoftCodeAnalysisCollectionsVersion>
53-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25208.7</MicrosoftDotNetXUnitExtensionsVersion>
52+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24172.5</MicrosoftDotNetXUnitExtensionsVersion>
5453
<MicrosoftExtensionsDependencyModelVersion>7.0.0</MicrosoftExtensionsDependencyModelVersion>
55-
<MicrosoftIORedistVersion>6.0.1</MicrosoftIORedistVersion>
54+
<MicrosoftIORedistVersion>6.0.0</MicrosoftIORedistVersion>
5655
<MicrosoftNetCompilersToolsetVersion>4.10.0-3.24175.2</MicrosoftNetCompilersToolsetVersion>
5756
<NuGetBuildTasksVersion>6.10.0-preview.2.81</NuGetBuildTasksVersion>
5857
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
@@ -73,4 +72,4 @@
7372
<FileVersion>$(VersionPrefix).$(FileVersion.Split('.')[3])</FileVersion>
7473
</PropertyGroup>
7574
</Target>
76-
</Project>
75+
</Project>

‎eng/cibuild_bootstrapped_msbuild.ps1‎

Lines changed: 1 addition & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -65,65 +65,11 @@ try {
6565

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

7171
KillProcessesFromRepo
7272

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

‎eng/cibuild_bootstrapped_msbuild.sh‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ InitializeDotNetCli true
5151

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

5757
bootstrapRoot="$Stage1Dir/bin/bootstrap"
@@ -77,15 +77,3 @@ export DOTNET_PERFLOG_DIR=$PerfLogDir
7777
# Prior to 3.0, the Csc task uses this environment variable to decide whether to run
7878
# a CLI host or directly execute the compiler.
7979
export DOTNET_HOST_PATH="$_InitializeDotNetCli/dotnet"
80-
81-
# When using bootstrapped MSBuild:
82-
# - Turn off node reuse (so that bootstrapped MSBuild processes don't stay running and lock files)
83-
# - Do run tests
84-
# - Don't try to create a bootstrap deployment
85-
if [ $onlyDocChanged = 0 ]
86-
then
87-
. "$ScriptRoot/common/build.sh" --restore --build --test --ci --nodereuse false --configuration $configuration /p:CreateBootstrap=false $properties $extra_properties
88-
89-
else
90-
. "$ScriptRoot/common/build.sh" --restore --build --ci --nodereuse false --configuration $configuration /p:CreateBootstrap=false $properties $extra_properties
91-
fi

‎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)