Skip to content

Commit 835037b

Browse files
GitHubSync update
1 parent 7c3fb61 commit 835037b

3 files changed

Lines changed: 32 additions & 37 deletions

File tree

deployment/cake/components-tasks.cake

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -289,16 +289,17 @@ public class ComponentsProcessor : ProcessorBase
289289
noBuild = false;
290290
}
291291

292-
if (isPackageContainerProject)
293-
{
294-
// In debug / local builds, automatic building of reference projects
295-
// is enabled for convenience. If that is the case, noBuild must be
296-
// set to false, but *only* in debug mode
297-
if (BuildContext.General.IsLocalBuild)
298-
{
299-
noBuild = false;
300-
}
301-
}
292+
// Disabled on 2025-09-23 since it was causing issues on local builds during packaging
293+
// if (isPackageContainerProject)
294+
// {
295+
// // In debug / local builds, automatic building of reference projects
296+
// // is enabled for convenience. If that is the case, noBuild must be
297+
// // set to false, but *only* in debug mode
298+
// if (BuildContext.General.IsLocalBuild)
299+
// {
300+
// noBuild = false;
301+
// }
302+
// }
302303

303304
// As described in the this issue: https://github.com/NuGet/Home/issues/4360
304305
// we should not use IsTool, but set BuildOutputTargetFolder instead

deployment/cake/lib-msbuild.cake

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,12 @@ private static void ConfigureMsBuild(BuildContext buildContext, MSBuildSettings
5656

5757
msBuildSettings.WithProperty("PackageOutputPath", buildContext.General.OutputRootDirectory);
5858

59-
// Only optimize in release mode
60-
if (!buildContext.General.IsLocalBuild)
61-
{
62-
buildContext.CakeContext.Information("This is NOT a local build, disabling building of project references");
59+
buildContext.CakeContext.Information("This is NOT a local build, disabling building of project references");
6360

64-
// Don't build project references (should already be built)
65-
msBuildSettings.WithProperty("BuildProjectReferences", "false");
61+
// Don't build project references (should already be built)
62+
msBuildSettings.WithProperty("BuildProjectReferences", "false");
6663

67-
//InjectAssemblySearchPathsInProjectFile(buildContext, projectName, GetProjectFileName(buildContext, projectName));
68-
}
69-
else
70-
{
71-
buildContext.CakeContext.Information("This is a local build, not disabling building of project references");
72-
}
64+
//InjectAssemblySearchPathsInProjectFile(buildContext, projectName, GetProjectFileName(buildContext, projectName));
7365

7466
// Continuous integration build
7567
msBuildSettings.ContinuousIntegrationBuild = true;
@@ -87,6 +79,12 @@ private static void ConfigureMsBuild(BuildContext buildContext, MSBuildSettings
8779
// msBuildSettings.WithProperty("SolutionExt", ".sln");
8880
// msBuildSettings.WithProperty("DefineExplicitDefaults", "true");
8981

82+
// Path maps
83+
if (!buildContext.General.IsLocalBuild)
84+
{
85+
msBuildSettings.WithProperty("PathMap", $"{buildContext.General.RootDirectory}=./");
86+
}
87+
9088
// Disable copyright info
9189
msBuildSettings.NoLogo = true;
9290

@@ -143,21 +141,11 @@ private static void ConfigureMsBuildForDotNet(BuildContext buildContext, DotNetM
143141

144142
msBuildSettings.WithProperty("PackageOutputPath", buildContext.General.OutputRootDirectory);
145143

146-
// Only optimize in release mode
147-
if (!buildContext.General.IsLocalBuild)
148-
{
149-
buildContext.CakeContext.Information($"This is NOT a local build, disabling building of project references");
150-
151-
// Don't build project references (should already be built)
152-
msBuildSettings.WithProperty("BuildProjectReferences", "false");
153-
154-
//InjectAssemblySearchPathsInProjectFile(buildContext, projectName, GetProjectFileName(buildContext, projectName));
155-
}
156-
else
157-
{
158-
buildContext.CakeContext.Information($"This is a local build, not disabling building of project references");
159-
}
144+
// Don't build project references (should already be built)
145+
msBuildSettings.WithProperty("BuildProjectReferences", "false");
160146

147+
//InjectAssemblySearchPathsInProjectFile(buildContext, projectName, GetProjectFileName(buildContext, projectName));
148+
161149
// Continuous integration build
162150
msBuildSettings.ContinuousIntegrationBuild = true;
163151
//msBuildSettings.WithProperty("ContinuousIntegrationBuild", "true");
@@ -174,6 +162,12 @@ private static void ConfigureMsBuildForDotNet(BuildContext buildContext, DotNetM
174162
// msBuildSettings.WithProperty("SolutionExt", ".sln");
175163
// msBuildSettings.WithProperty("DefineExplicitDefaults", "true");
176164

165+
// Path maps
166+
if (!buildContext.General.IsLocalBuild)
167+
{
168+
msBuildSettings.WithProperty("PathMap", $"{buildContext.General.RootDirectory}=./");
169+
}
170+
177171
// Disable copyright info
178172
msBuildSettings.NoLogo = true;
179173

deployment/cake/tasks.cake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
// It probably means the tool is not correctly installed.
3737
// `dotnet tool install --global dotnet-sonarscanner --ignore-failed-sources`
3838
//#tool "nuget:?package=MSBuild.SonarQube.Runner.Tool&version=4.8.0"
39-
#tool "nuget:?package=dotnet-sonarscanner&version=10.3.0"
39+
#tool "nuget:?package=dotnet-sonarscanner&version=10.4.0"
4040

4141
//-------------------------------------------------------------
4242
// BACKWARDS COMPATIBILITY CODE - START

0 commit comments

Comments
 (0)