Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion eng/Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
<PackageVersion Include="NuGet.Frameworks" Version="$(NuGetBuildTasksVersion)" />
<PackageVersion Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
<PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
<PackageVersion Include="System.Memory" Version="$(SystemMemoryVersion)" />
<PackageVersion Include="System.Net.Http" Version="$(SystemNetHttpVersion)" />
<PackageVersion Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
Expand Down
4 changes: 2 additions & 2 deletions eng/SourceBuildPrebuiltBaseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
<UsagePattern IdentityGlob="System.Collections.Immutable/*8.0.0*" />
<UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/*8.0.0*" />
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/*8.0.0*" />
<UsagePattern IdentityGlob="System.Formats.Asn1/*8.0.1*" />
<UsagePattern IdentityGlob="System.Formats.Asn1/*8.0.0*" />
<UsagePattern IdentityGlob="System.Reflection.Metadata/*8.0.0*" />
<UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/*8.0.0*" />
<UsagePattern IdentityGlob="System.Resources.Extensions/*8.0.0*" />
<UsagePattern IdentityGlob="System.Security.Cryptography.Pkcs/*8.0.0*" />
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*8.0.0*" />
<UsagePattern IdentityGlob="System.Security.Cryptography.Xml/*8.0.0*" />
<UsagePattern IdentityGlob="System.Text.Json/*8.0.5*" />
<UsagePattern IdentityGlob="System.Text.Json/*8.0.0*" />
<UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*8.0.0*" />
</IgnorePatterns>
<Usages>
Expand Down
14 changes: 5 additions & 9 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="8.0.5">
<Dependency Name="System.Text.Json" Version="8.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
<Dependency Name="System.Threading.Tasks.Dataflow" Version="8.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand All @@ -65,10 +65,6 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
<Dependency Name="System.Formats.Asn1" Version="8.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25208.7">
Expand Down Expand Up @@ -100,9 +96,9 @@
<Sha>919d4dbfb0dffb35a702417e28ceea652d248bc6</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25208.7">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24172.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c7a36e53f91e41943746f97a8c183549364c5092</Sha>
<Sha>ceb071c1060b8e6de404c065b4045442570caa18</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
</Dependencies>
11 changes: 5 additions & 6 deletions eng/Versions.props
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.10.27</VersionPrefix>
<VersionPrefix>17.10.29</VersionPrefix>
<DotNetFinalVersionKind>release</DotNetFinalVersionKind>
<PackageValidationBaselineVersion>17.8.3</PackageValidationBaselineVersion>
<AssemblyVersion>15.1.0.0</AssemblyVersion>
Expand All @@ -27,7 +27,6 @@
<PropertyGroup>
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
<SystemConfigurationConfigurationManagerVersion>8.0.0</SystemConfigurationConfigurationManagerVersion>
<SystemFormatsAsn1Version>8.0.1</SystemFormatsAsn1Version>
<!--
Modifying the version of System.Memory is very high impact and causes downstream breaks in third-party tooling that uses the MSBuild API.
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+
Expand All @@ -40,7 +39,7 @@
<SystemResourcesExtensionsVersion>8.0.0</SystemResourcesExtensionsVersion>
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
<SystemTextEncodingCodePagesVersion>7.0.0</SystemTextEncodingCodePagesVersion>
<SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
<SystemTextJsonVersion>8.0.0</SystemTextJsonVersion>
<SystemThreadingChannelsVersion>8.0.0</SystemThreadingChannelsVersion>
<SystemThreadingTasksDataflowVersion>8.0.0</SystemThreadingTasksDataflowVersion>
</PropertyGroup>
Expand All @@ -50,9 +49,9 @@
Otherwise, this version of dotnet will not be installed and the build will error out. -->
<DotNetCliVersion>$([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1))</DotNetCliVersion>
<MicrosoftCodeAnalysisCollectionsVersion>4.2.0-1.22102.8</MicrosoftCodeAnalysisCollectionsVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25208.7</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24172.5</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftExtensionsDependencyModelVersion>7.0.0</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftIORedistVersion>6.0.1</MicrosoftIORedistVersion>
<MicrosoftIORedistVersion>6.0.0</MicrosoftIORedistVersion>
<MicrosoftNetCompilersToolsetVersion>4.10.0-3.24175.2</MicrosoftNetCompilersToolsetVersion>
<NuGetBuildTasksVersion>6.10.0-preview.2.81</NuGetBuildTasksVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
Expand All @@ -73,4 +72,4 @@
<FileVersion>$(VersionPrefix).$(FileVersion.Split('.')[3])</FileVersion>
</PropertyGroup>
</Target>
</Project>
</Project>
56 changes: 1 addition & 55 deletions eng/cibuild_bootstrapped_msbuild.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -65,65 +65,11 @@ try {

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

KillProcessesFromRepo

$bootstrapRoot = Join-Path $Stage1BinDir "bootstrap"

# we need to do this to guarantee we have/know where dotnet.exe is installed
$dotnetToolPath = InitializeDotNetCli $true
$dotnetExePath = Join-Path $dotnetToolPath "dotnet.exe"

if ($msbuildEngine -eq 'vs')
{
$buildToolPath = Join-Path $bootstrapRoot "net472\MSBuild\Current\Bin\MSBuild.exe"
$buildToolCommand = "";
$buildToolFramework = "net472"
}
else
{
$buildToolPath = $dotnetExePath
$buildToolCommand = Join-Path $bootstrapRoot "net8.0\MSBuild\MSBuild.dll"
$buildToolFramework = "net8.0"
}

# Use separate artifacts folder for stage 2
# $env:ArtifactsDir = Join-Path $ArtifactsDir "2\"

& $dotnetExePath build-server shutdown

if ($buildStage1)
{
if (Test-Path $Stage1Dir)
{
Remove-Item -Force -Recurse $Stage1Dir
}

Move-Item -Path $ArtifactsDir -Destination $Stage1Dir -Force
}

$buildTool = @{ Path = $buildToolPath; Command = $buildToolCommand; Tool = $msbuildEngine; Framework = $buildToolFramework }
$global:_BuildTool = $buildTool

# Ensure that debug bits fail fast, rather than hanging waiting for a debugger attach.
$env:MSBUILDDONOTLAUNCHDEBUGGER="true"

# Opt into performance logging. https://github.com/dotnet/msbuild/issues/5900
$env:DOTNET_PERFLOG_DIR=$PerfLogDir

# When using bootstrapped MSBuild:
# - Turn off node reuse (so that bootstrapped MSBuild processes don't stay running and lock files)
# - Do run tests
# - Don't try to create a bootstrap deployment
if ($onlyDocChanged) {
& $PSScriptRoot\Common\Build.ps1 -restore -build -ci /p:CreateBootstrap=false /nr:false @properties
}
else {
& $PSScriptRoot\Common\Build.ps1 -restore -build -test -ci /p:CreateBootstrap=false /nr:false @properties
}

exit $lastExitCode
}
catch {
Expand Down
14 changes: 1 addition & 13 deletions eng/cibuild_bootstrapped_msbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ InitializeDotNetCli true

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

bootstrapRoot="$Stage1Dir/bin/bootstrap"
Expand All @@ -77,15 +77,3 @@ export DOTNET_PERFLOG_DIR=$PerfLogDir
# Prior to 3.0, the Csc task uses this environment variable to decide whether to run
# a CLI host or directly execute the compiler.
export DOTNET_HOST_PATH="$_InitializeDotNetCli/dotnet"

# When using bootstrapped MSBuild:
# - Turn off node reuse (so that bootstrapped MSBuild processes don't stay running and lock files)
# - Do run tests
# - Don't try to create a bootstrap deployment
if [ $onlyDocChanged = 0 ]
then
. "$ScriptRoot/common/build.sh" --restore --build --test --ci --nodereuse false --configuration $configuration /p:CreateBootstrap=false $properties $extra_properties

else
. "$ScriptRoot/common/build.sh" --restore --build --ci --nodereuse false --configuration $configuration /p:CreateBootstrap=false $properties $extra_properties
fi
2 changes: 1 addition & 1 deletion eng/common/templates-official/job/source-build.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions eng/common/templates/job/source-build.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Build.UnitTests/BackEnd/MSBuild_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ public void LogErrorWhenBuildingVCProj()
/// However, it's a situation where the project author doesn't have control over the
/// property value and so he can't escape it himself.
/// </summary>
[Fact]
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/11888")]
public void PropertyOverridesContainSemicolon()
{
ObjectModelHelpers.DeleteTempProjectDirectory();
Expand Down
16 changes: 8 additions & 8 deletions src/Build.UnitTests/EscapingInProjects_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -957,7 +957,7 @@ public FullProjectsUsingMicrosoftCommonTargets(ITestOutputHelper output)
/// <summary>
/// ESCAPING: Escaping in conditionals is broken.
/// </summary>
[Fact]
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/11888")]
public void SemicolonInConfiguration()
{
ObjectModelHelpers.DeleteTempProjectDirectory();
Expand Down Expand Up @@ -1017,7 +1017,7 @@ public class Class1
/// <summary>
/// ESCAPING: Escaping in conditionals is broken.
/// </summary>
[Fact]
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/11888")]
public void SemicolonInConfiguration_UsingTaskHost()
{
string originalOverrideTaskHostVariable = Environment.GetEnvironmentVariable("MSBUILDFORCEALLTASKSOUTOFPROC");
Expand Down Expand Up @@ -1087,7 +1087,7 @@ public class Class1
/// <summary>
/// ESCAPING: CopyBuildTarget target fails if the output assembly name contains a semicolon or single-quote
/// </summary>
[Fact]
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/11888")]
public void SemicolonInAssemblyName()
{
ObjectModelHelpers.DeleteTempProjectDirectory();
Expand Down Expand Up @@ -1142,7 +1142,7 @@ public class Class1
/// <summary>
/// ESCAPING: CopyBuildTarget target fails if the output assembly name contains a semicolon or single-quote
/// </summary>
[Fact]
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/11888")]
public void SemicolonInAssemblyName_UsingTaskHost()
{
string originalOverrideTaskHostVariable = Environment.GetEnvironmentVariable("MSBUILDFORCEALLTASKSOUTOFPROC");
Expand Down Expand Up @@ -1207,7 +1207,7 @@ public class Class1
/// <summary>
/// ESCAPING: Conversion Issue: Properties with $(xxx) as literals are not being converted correctly
/// </summary>
[Fact]
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/11888")]
public void DollarSignInAssemblyName()
{
ObjectModelHelpers.DeleteTempProjectDirectory();
Expand Down Expand Up @@ -1262,7 +1262,7 @@ public class Class1
/// <summary>
/// ESCAPING: Conversion Issue: Properties with $(xxx) as literals are not being converted correctly
/// </summary>
[Fact]
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/11888")]
public void DollarSignInAssemblyName_UsingTaskHost()
{
string originalOverrideTaskHostVariable = Environment.GetEnvironmentVariable("MSBUILDFORCEALLTASKSOUTOFPROC");
Expand Down Expand Up @@ -1327,7 +1327,7 @@ public class Class1
/// <summary>
/// This is the case when one of the source code files in the project has a filename containing a semicolon.
/// </summary>
[Fact]
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/11888")]
public void SemicolonInSourceCodeFilename()
{
ObjectModelHelpers.DeleteTempProjectDirectory();
Expand Down Expand Up @@ -1382,7 +1382,7 @@ public class Class1
/// <summary>
/// This is the case when one of the source code files in the project has a filename containing a semicolon.
/// </summary>
[Fact]
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/11888")]
public void SemicolonInSourceCodeFilename_UsingTaskHost()
{
string originalOverrideTaskHostVariable = Environment.GetEnvironmentVariable("MSBUILDFORCEALLTASKSOUTOFPROC");
Expand Down
10 changes: 5 additions & 5 deletions src/MSBuild/app.amd64.config
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@

<dependentAssembly>
<assemblyIdentity name="Microsoft.IO.Redist" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="6.0.0.1" />
<codeBase version="6.0.0.1" href="..\Microsoft.IO.Redist.dll"/>
<bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="6.0.0.0" />
<codeBase version="6.0.0.0" href="..\Microsoft.IO.Redist.dll"/>
</dependentAssembly>

<!-- Redirects for assemblies redistributed by MSBuild (in the .vsix). -->
Expand Down Expand Up @@ -134,8 +134,8 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
<codeBase version="8.0.0.5" href="..\System.Text.Json.dll"/>
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
<codeBase version="8.0.0.0" href="..\System.Text.Json.dll"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
Expand Down Expand Up @@ -229,4 +229,4 @@
</projectImportSearchPaths>
</toolset>
</msbuildToolsets>
</configuration>
</configuration>
8 changes: 2 additions & 6 deletions src/MSBuild/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.IO.Redist" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.NET.StringTools" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.0.0" newVersion="1.0.0.0" />
Expand Down Expand Up @@ -94,7 +90,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
Expand Down Expand Up @@ -182,4 +178,4 @@
</projectImportSearchPaths>
</toolset>
</msbuildToolsets>
</configuration>
</configuration>
2 changes: 1 addition & 1 deletion src/Tasks.UnitTests/MSBuild_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ public void LogErrorWhenBuildingVCProj()
#if RUNTIME_TYPE_NETCORE
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/259")]
#else
[Fact]
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/11888")]
#endif
public void PropertyOverridesContainSemicolon()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2566,7 +2566,7 @@ public References(ITestOutputHelper output)
_output = output;
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/11888")]
public void DontLockP2PReferenceWhenResolvingSystemTypes()
{
// This WriteLine is a hack. On a slow machine, the Tasks unittest fails because remoting
Expand Down Expand Up @@ -2741,7 +2741,7 @@ public class Class1
/// Assembly.LoadFile on that relative path, which fails (LoadFile requires an
/// absolute path). The fix was to use Assembly.LoadFrom instead.
/// </summary>
[Fact]
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/11888")]
public void ReferencedAssemblySpecifiedUsingRelativePath()
{
// This WriteLine is a hack. On a slow machine, the Tasks unittest fails because remoting
Expand Down
Loading
Loading