Skip to content

Disable packing in bootstrap build #11133

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.

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

Merged
merged 4 commits into from
Dec 13, 2024
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
5 changes: 4 additions & 1 deletion eng/TestAssets.targets
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,15 @@
Inputs="@(ProjectsToPack);@(SourceFilesForPacking)"
Outputs="$(ArtifactsNonShippingPackagesDir)\Microsoft.Build.$(Version).nupkg;$(ArtifactsNonShippingPackagesDir)\Microsoft.Build.Framework.$(Version).nupkg;$(ArtifactsNonShippingPackagesDir)\Microsoft.NET.StringTools.$(Version).nupkg">

<MSBuild Projects="@(ProjectsToPack)"
<!--
Temporarily disabling the packing within bootstrap build, until #11090 is resolved
<MSBuild Projects="@(ProjectsToPack)"
Targets="Pack"
Properties="PackageOutputPath=$(ArtifactsNonShippingPackagesDir);PackageVersion=$(PackageVersion)"
BuildInParallel="true">
<Output TaskParameter="TargetOutputs" ItemName="PackageOutputs" />
</MSBuild>
-->

</Target>
</Project>
12 changes: 6 additions & 6 deletions src/BuildCheck.UnitTests/EndToEndTests.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
Expand Down Expand Up @@ -579,7 +579,7 @@ public void EditorConfig_SeverityAppliedCorrectly(string BC0101Severity, string?
}
}

[Fact]
[Fact(Skip = "To unblock: https://github.com/dotnet/msbuild/issues/11090")]
public void CheckHasAccessToAllConfigs()
{
using (var env = TestEnvironment.Create())
Expand Down Expand Up @@ -757,7 +757,7 @@ public void NoEnvironmentVariableProperty_DeferredProcessing(bool warnAsError, b
}
}

[Theory]
[Theory(Skip = "To unblock: https://github.com/dotnet/msbuild/issues/11090")]
[InlineData("CheckCandidate", new[] { "CustomRule1", "CustomRule2" })]
[InlineData("CheckCandidateWithMultipleChecksInjected", new[] { "CustomRule1", "CustomRule2", "CustomRule3" }, true)]
public void CustomCheckTest_NoEditorConfig(string checkCandidate, string[] expectedRegisteredRules, bool expectedRejectedChecks = false)
Expand Down Expand Up @@ -790,7 +790,7 @@ public void CustomCheckTest_NoEditorConfig(string checkCandidate, string[] expec
}
}

[Theory]
[Theory(Skip = "To unblock: https://github.com/dotnet/msbuild/issues/11090")]
[InlineData("CheckCandidate", "X01234", "error", "error X01234: http://samplelink.com/X01234")]
[InlineData("CheckCandidateWithMultipleChecksInjected", "X01234", "warning", "warning X01234: http://samplelink.com/X01234")]
public void CustomCheckTest_WithEditorConfig(string checkCandidate, string ruleId, string severity, string expectedMessage)
Expand All @@ -817,7 +817,7 @@ public void CustomCheckTest_WithEditorConfig(string checkCandidate, string ruleI
}
}

[Theory]
[Theory(Skip = "To unblock: https://github.com/dotnet/msbuild/issues/11090")]
[InlineData("X01236", "ErrorOnInitializeCheck", "Something went wrong initializing")]
[InlineData("X01237", "ErrorOnRegisteredAction", "something went wrong when executing registered action")]
[InlineData("X01238", "ErrorWhenRegisteringActions", "something went wrong when registering actions")]
Expand Down Expand Up @@ -867,7 +867,7 @@ public void DoesNotRunOnRestore(bool buildInOutOfProcessNode)
}

#if NET
[Fact]
[Fact(Skip = "To unblock: https://github.com/dotnet/msbuild/issues/11090")]
public void TestBuildCheckTemplate()
{
TransientTestFolder workFolder = _env.CreateFolder(createFolder: true);
Expand Down