Skip to content

Commit

Permalink
Reserve version number for localpackage config (#20654)
Browse files Browse the repository at this point in the history
* 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)
  • Loading branch information
merlynomsft authored Nov 22, 2024
1 parent dc9bef8 commit 23db917
Show file tree
Hide file tree
Showing 173 changed files with 44,460 additions and 3 deletions.
5 changes: 4 additions & 1 deletion BuildConfigGen/EnsureUpdateModeVerifier.cs
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,13 @@ public IEnumerable<string> GetVerifyErrors(bool skipContentCheck)
{
FileInfo fi = new FileInfo(r.Key);

if (fi.Name.Equals("resources.resjson", StringComparison.OrdinalIgnoreCase))
if (fi.Name.Equals("resources.resjson", StringComparison.OrdinalIgnoreCase)
|| fi.Name.Equals(".npmrc", StringComparison.OrdinalIgnoreCase))
{
// resources.resjson is generated by make.js and does not need to be verified
// it can differ between configs if configs have different inputs (causes verifier to fail);

// TODO: ignore .npmrc for now; it's known to be out-of-sync due to upstream updates
}
else
{
Expand Down
7 changes: 5 additions & 2 deletions BuildConfigGen/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ static void Main(string? task = null, string? configs = null, int? currentSprint
Console.WriteLine(e2.ToString());
Console.ForegroundColor = restore;
Console.WriteLine();
Console.WriteLine("An exception occured generating configs. Exception message below: (full callstack above)");
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)");
Console.WriteLine(e2.Message);

Environment.Exit(1);
Expand Down Expand Up @@ -1178,7 +1178,10 @@ private static void CopyConfig(string gitRootPath, string taskTargetPathOrUnders
{
string targetPath = Path.Combine(taskOutput, ".npmrc");
ensureUpdateModeVerifier!.WriteAllText(targetPath, @"scripts-prepend-node-path=true
", false);
registry=https://pkgs.dev.azure.com/mseng/PipelineTools/_packaging/PipelineTools_PublicPackages/npm/registry/
always-auth=true", false);
}
}

Expand Down

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

160 changes: 160 additions & 0 deletions _generated/_buildConfigs/ANTV1/LocalPackages/package-lock.json

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

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

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

Loading

0 comments on commit 23db917

Please sign in to comment.