Skip to content

Commit 23db917

Browse files
authored
Reserve version number for localpackage config (#20654)
* Add global version * update global version * update localpackage lock files * upstream update * Re-add validation dropped in 0e190cd#diff-1a844feaaef9906cefaac6c78d468e0c8bc66cc53d17db0938c150093e5712e2 * skip launch profile * update globalversion.txt * add contact info in error messages * don't validate npmrc differences (for now)
1 parent dc9bef8 commit 23db917

File tree

173 files changed

+44460
-3
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+44460
-3
lines changed

BuildConfigGen/EnsureUpdateModeVerifier.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,13 @@ public IEnumerable<string> GetVerifyErrors(bool skipContentCheck)
8383
{
8484
FileInfo fi = new FileInfo(r.Key);
8585

86-
if (fi.Name.Equals("resources.resjson", StringComparison.OrdinalIgnoreCase))
86+
if (fi.Name.Equals("resources.resjson", StringComparison.OrdinalIgnoreCase)
87+
|| fi.Name.Equals(".npmrc", StringComparison.OrdinalIgnoreCase))
8788
{
8889
// resources.resjson is generated by make.js and does not need to be verified
8990
// it can differ between configs if configs have different inputs (causes verifier to fail);
91+
92+
// TODO: ignore .npmrc for now; it's known to be out-of-sync due to upstream updates
9093
}
9194
else
9295
{

BuildConfigGen/Program.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ static void Main(string? task = null, string? configs = null, int? currentSprint
8989
Console.WriteLine(e2.ToString());
9090
Console.ForegroundColor = restore;
9191
Console.WriteLine();
92-
Console.WriteLine("An exception occured generating configs. Exception message below: (full callstack above)");
92+
Console.WriteLine("An exception occured generating configs. [MSFT internal only: questions/problems please refer to https://aka.ms/ado/taskseng] Exception message below: (full callstack above)");
9393
Console.WriteLine(e2.Message);
9494

9595
Environment.Exit(1);
@@ -1178,7 +1178,10 @@ private static void CopyConfig(string gitRootPath, string taskTargetPathOrUnders
11781178
{
11791179
string targetPath = Path.Combine(taskOutput, ".npmrc");
11801180
ensureUpdateModeVerifier!.WriteAllText(targetPath, @"scripts-prepend-node-path=true
1181-
", false);
1181+
1182+
registry=https://pkgs.dev.azure.com/mseng/PipelineTools/_packaging/PipelineTools_PublicPackages/npm/registry/
1183+
1184+
always-auth=true", false);
11821185
}
11831186
}
11841187

_generated/_buildConfigs/ANTV1/LocalPackages/Tests/package-lock.json

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

_generated/_buildConfigs/ANTV1/LocalPackages/package-lock.json

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

_generated/_buildConfigs/AndroidSigningV2/LocalPackages/Tests/package-lock.json

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

_generated/_buildConfigs/AndroidSigningV2/LocalPackages/package-lock.json

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

0 commit comments

Comments
 (0)