Skip to content

Commit 04305ce

Browse files
RomainMullermergify[bot]
authored andcommitted
feat: configure AWS logo for NuGet packages (#797)
Configure a `PackageIconUrl` on all the NuGet packages, so as to have a somewhat consistent branding experience. Currently, the AWS logo is being used; this may later be replaced by a `jsii` logo if/when we get one.
1 parent 3b29a0b commit 04305ce

File tree

11 files changed

+21
-12
lines changed

11 files changed

+21
-12
lines changed

packages/jsii-calc/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@
5757
},
5858
"dotnet": {
5959
"namespace": "Amazon.JSII.Tests.CalculatorNamespace",
60-
"packageId": "Amazon.JSII.Tests.CalculatorPackageId"
60+
"packageId": "Amazon.JSII.Tests.CalculatorPackageId",
61+
"iconUrl": "https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png"
6162
},
6263
"python": {
6364
"distName": "jsii-calc",

packages/jsii-calc/test/assembly.jsii

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@
211211
"schema": "jsii/0.10.0",
212212
"targets": {
213213
"dotnet": {
214+
"iconUrl": "https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png",
214215
"namespace": "Amazon.JSII.Tests.CalculatorNamespace",
215216
"packageId": "Amazon.JSII.Tests.CalculatorPackageId"
216217
},
@@ -9616,5 +9617,5 @@
96169617
}
96179618
},
96189619
"version": "0.17.0",
9619-
"fingerprint": "CsCYKhkgjZW99rFJjvvx/PmmMBkwGXVXbapg1D/LdhQ="
9620+
"fingerprint": "0rRLU+O4hydb2vIjisfE/CmN7SzcwuHuf1lZMR5qwJg="
96209621
}

packages/jsii-dotnet-analyzers/src/Amazon.JSII.Analyzers.UnitTests/Amazon.JSII.Analyzers.UnitTests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFramework>netcoreapp2.1</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<AssemblyName>Amazon.JSII.Analyzers.UnitTests</AssemblyName>
77
</PropertyGroup>
@@ -20,6 +20,6 @@
2020
<ItemGroup>
2121
<ProjectReference Include="..\Amazon.JSII.Analyzers\Amazon.JSII.Analyzers.csproj" />
2222
</ItemGroup>
23-
24-
23+
24+
2525
</Project>

packages/jsii-dotnet-analyzers/src/Amazon.JSII.Analyzers/Amazon.JSII.Analyzers.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
<PropertyGroup>
55
<PackageId>Amazon.JSII.Analyzers</PackageId>
66
<Title>.NET Roslyn Analyzers for JSII</Title>
7-
<TargetFramework>netstandard2.0</TargetFramework>
7+
<TargetFramework>netcoreapp2.1</TargetFramework>
88
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
9+
<PackageIconUrl>https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png</PackageIconUrl>
910
</PropertyGroup>
1011

1112
<ItemGroup>

packages/jsii-dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Amazon.JSII.JsonModel.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<PropertyGroup>
55
<PackageId>Amazon.JSII.JsonModel</PackageId>
66
<Title>.NET JsonModel for JSII</Title>
7+
<PackageIconUrl>https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png</PackageIconUrl>
78
</PropertyGroup>
89

910
<ItemGroup>

packages/jsii-dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<PropertyGroup>
55
<PackageId>Amazon.JSII.Runtime</PackageId>
66
<Title>.NET Runtime for JSII</Title>
7+
<PackageIconUrl>https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png</PackageIconUrl>
78
</PropertyGroup>
89

910
<ItemGroup>

packages/jsii-kernel/test/kernel.test.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ defineTest('objects created inside the sandbox are returned with type info and n
203203
defineTest('naming allows returns the module name for different languages', (sandbox) => {
204204
expect(sandbox.naming({ assembly: 'jsii-calc' }).naming).toEqual({
205205
dotnet: {
206+
iconUrl: 'https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png',
206207
namespace: 'Amazon.JSII.Tests.CalculatorNamespace',
207208
packageId: 'Amazon.JSII.Tests.CalculatorPackageId',
208209
},
@@ -562,9 +563,9 @@ defineTest('sync overrides: properties - readwrite', (sandbox) => {
562563
expect(callback.set.property).toBe('theProperty');
563564
setValue = callback.set.value;
564565
return undefined;
565-
}
566+
}
566567
throw new Error('Invalid callback. Expected get/set');
567-
568+
568569
});
569570

570571
const value = sandbox.invoke({ objref: obj, method: 'retrieveValueOfTheProperty' });
@@ -591,9 +592,9 @@ defineTest('sync overrides: properties - readwrite (backed by functions)', (sand
591592
expect(callback.set.property).toBe('otherProperty');
592593
setValue = callback.set.value;
593594
return undefined;
594-
}
595+
}
595596
throw new Error('Invalid callback. Expected get/set');
596-
597+
597598
});
598599

599600
const value = sandbox.invoke({ objref: obj, method: 'retrieveOtherProperty' });

packages/jsii-pacmak/lib/targets/dotnet.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export default class Dotnet extends Target {
5555
await this.copyFiles(
5656
path.join(sourceDir, packageId, 'bin', 'Release'),
5757
outDir);
58-
await fs.remove(path.join(outDir, 'netstandard2.0'));
58+
await fs.remove(path.join(outDir, 'netcoreapp2.1'));
5959
}
6060

6161
private async generateNuGetConfigForLocalDeps(sourceDirectory: string, currentOutputDirectory: string): Promise<void> {

packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/.jsii

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@
211211
"schema": "jsii/0.10.0",
212212
"targets": {
213213
"dotnet": {
214+
"iconUrl": "https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png",
214215
"namespace": "Amazon.JSII.Tests.CalculatorNamespace",
215216
"packageId": "Amazon.JSII.Tests.CalculatorPackageId"
216217
},
@@ -9616,5 +9617,5 @@
96169617
}
96179618
},
96189619
"version": "0.17.0",
9619-
"fingerprint": "CsCYKhkgjZW99rFJjvvx/PmmMBkwGXVXbapg1D/LdhQ="
9620+
"fingerprint": "0rRLU+O4hydb2vIjisfE/CmN7SzcwuHuf1lZMR5qwJg="
96209621
}

packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<LicenseUrl>https://spdx.org/licenses/Apache-2.0.html</LicenseUrl>
1313
<Authors>Amazon Web Services</Authors>
1414
<Language>en-US</Language>
15+
<PackageIconUrl>https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png</PackageIconUrl>
1516
</PropertyGroup>
1617
<ItemGroup>
1718
<EmbeddedResource Include="jsii-calc-0.17.0.tgz"/>

0 commit comments

Comments
 (0)