Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/go_modules/packages/jsii/go-runti…
Browse files Browse the repository at this point in the history
…me/jsii-runtime-go/golang.org/x/tools-0.15.0
  • Loading branch information
mergify[bot] authored Nov 14, 2023
2 parents fd7c678 + bd02eef commit 7e1bcc0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion packages/@jsii/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<PackageReference Update="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
<PackageReference Update="Microsoft.CodeQuality.Analyzers" Version="3.3.2" />

<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Update="NSubstitute" Version="5.1.0" />
<PackageReference Update="xunit" Version="2.6.1" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.5.3" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ out object? result
return null;
}

throw new ArgumentException("Callback does not specificy a method, getter, or setter to invoke");
throw new ArgumentException("Callback does not specify a method, getter, or setter to invoke");
}

private static CallbackResult? InvokeMethod(InvokeRequest request, IReferenceMap referenceMap)
Expand Down Expand Up @@ -251,4 +251,4 @@ private CallbackResult(TypeReference type, bool isOptional, object? value) : bas

public object? Value { get; }
}
}
}
1 change: 1 addition & 0 deletions packages/jsii-pacmak/lib/npm-modules.ts
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ async function updateNpmIgnore(
'Exclude typescript source and config',
'*.ts',
'tsconfig.json',
'*.tsbuildinfo',
);
includePattern(
'Include javascript files and typescript declarations',
Expand Down

0 comments on commit 7e1bcc0

Please sign in to comment.