Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: configure AWS logo for NuGet packages #797

Merged
merged 2 commits into from
Sep 19, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/jsii-calc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
},
"dotnet": {
"namespace": "Amazon.JSII.Tests.CalculatorNamespace",
"packageId": "Amazon.JSII.Tests.CalculatorPackageId"
"packageId": "Amazon.JSII.Tests.CalculatorPackageId",
"iconUrl": "https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png"
},
"python": {
"distName": "jsii-calc",
Expand Down
3 changes: 2 additions & 1 deletion packages/jsii-calc/test/assembly.jsii
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@
"schema": "jsii/0.10.0",
"targets": {
"dotnet": {
"iconUrl": "https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png",
"namespace": "Amazon.JSII.Tests.CalculatorNamespace",
"packageId": "Amazon.JSII.Tests.CalculatorPackageId"
},
Expand Down Expand Up @@ -9615,5 +9616,5 @@
}
},
"version": "0.17.0",
"fingerprint": "izzAyIl+j9C+Td89XVvxC7M9UPkjYsYVLhlLCDPsVDY="
"fingerprint": "3AZBzWGigiml1w1CpsQCzfmubSSS3F8vFHqddOFLO1Y="
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
<IsPackable>false</IsPackable>
<AssemblyName>Amazon.JSII.Analyzers.UnitTests</AssemblyName>
</PropertyGroup>
Expand All @@ -20,6 +20,6 @@
<ItemGroup>
<ProjectReference Include="..\Amazon.JSII.Analyzers\Amazon.JSII.Analyzers.csproj" />
</ItemGroup>


</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
<PropertyGroup>
<PackageId>Amazon.JSII.Analyzers</PackageId>
<Title>.NET Roslyn Analyzers for JSII</Title>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageIconUrl>https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png</PackageIconUrl>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<PropertyGroup>
<PackageId>Amazon.JSII.JsonModel</PackageId>
<Title>.NET JsonModel for JSII</Title>
<PackageIconUrl>https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png</PackageIconUrl>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<PropertyGroup>
<PackageId>Amazon.JSII.Runtime</PackageId>
<Title>.NET Runtime for JSII</Title>
<PackageIconUrl>https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png</PackageIconUrl>
</PropertyGroup>

<ItemGroup>
Expand Down
9 changes: 5 additions & 4 deletions packages/jsii-kernel/test/kernel.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ defineTest('objects created inside the sandbox are returned with type info and n
defineTest('naming allows returns the module name for different languages', (sandbox) => {
expect(sandbox.naming({ assembly: 'jsii-calc' }).naming).toEqual({
dotnet: {
iconUrl: 'https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png',
namespace: 'Amazon.JSII.Tests.CalculatorNamespace',
packageId: 'Amazon.JSII.Tests.CalculatorPackageId',
},
Expand Down Expand Up @@ -562,9 +563,9 @@ defineTest('sync overrides: properties - readwrite', (sandbox) => {
expect(callback.set.property).toBe('theProperty');
setValue = callback.set.value;
return undefined;
}
}
throw new Error('Invalid callback. Expected get/set');

});

const value = sandbox.invoke({ objref: obj, method: 'retrieveValueOfTheProperty' });
Expand All @@ -591,9 +592,9 @@ defineTest('sync overrides: properties - readwrite (backed by functions)', (sand
expect(callback.set.property).toBe('otherProperty');
setValue = callback.set.value;
return undefined;
}
}
throw new Error('Invalid callback. Expected get/set');

});

const value = sandbox.invoke({ objref: obj, method: 'retrieveOtherProperty' });
Expand Down
2 changes: 1 addition & 1 deletion packages/jsii-pacmak/lib/targets/dotnet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export default class Dotnet extends Target {
await this.copyFiles(
path.join(sourceDir, packageId, 'bin', 'Release'),
outDir);
await fs.remove(path.join(outDir, 'netstandard2.0'));
await fs.remove(path.join(outDir, 'netcoreapp2.1'));
}

private async generateNuGetConfigForLocalDeps(sourceDirectory: string, currentOutputDirectory: string): Promise<void> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@
"schema": "jsii/0.10.0",
"targets": {
"dotnet": {
"iconUrl": "https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png",
"namespace": "Amazon.JSII.Tests.CalculatorNamespace",
"packageId": "Amazon.JSII.Tests.CalculatorPackageId"
},
Expand Down Expand Up @@ -9615,5 +9616,5 @@
}
},
"version": "0.17.0",
"fingerprint": "izzAyIl+j9C+Td89XVvxC7M9UPkjYsYVLhlLCDPsVDY="
"fingerprint": "3AZBzWGigiml1w1CpsQCzfmubSSS3F8vFHqddOFLO1Y="
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<LicenseUrl>https://spdx.org/licenses/Apache-2.0.html</LicenseUrl>
<Authors>Amazon Web Services</Authors>
<Language>en-US</Language>
<PackageIconUrl>https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png</PackageIconUrl>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="jsii-calc-0.17.0.tgz"/>
Expand Down
2 changes: 1 addition & 1 deletion packages/jsii-ruby-runtime/project/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
jsii_runtime (0.16.0)
jsii_runtime (0.17.0)

GEM
remote: https://rubygems.org/
Expand Down
1 change: 1 addition & 0 deletions packages/jsii/test/negatives/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
!mylib.d.ts
tsconfig.json