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

Build .NET sources by default when running jsii-pacmak. #160

Merged
merged 7 commits into from
Aug 8, 2018

Conversation

mpiroc
Copy link
Contributor

@mpiroc mpiroc commented Aug 7, 2018

  • Split jsii-dotnet-runtime's integration tests into a separate package, which breaks a dependency loop with jsii-pacmak.
  • Generate PackageReferences for assemblies, rather than ProjectReferences.
  • Implement Target.build for .NET.

mpiroc and others added 3 commits August 7, 2018 14:59
Stops outputting the .tgz for 'npm pack' in the package directory, instead
put it in a specially created temporary directory. This avoids concurrent
executions depending on the same path & deleting each other's files.
Copy link
Contributor

@eladb eladb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Critical "try-catch" when requiring dev-dep


# Run integration tests
echo "Running integration tests"
#dotnet build -c Release ./test/Amazon.JSII.Runtime.IntegrationTests
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

delete

@@ -7,7 +7,8 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Amazon.JSII.Tests.Calculator\Amazon.JSII.Tests.Calculator.csproj" />
<PackageReference Include="Amazon.JSII.Tests.Calculator" Version="0.6.2" />
<!--<ProjectReference Include="..\Amazon.JSII.Tests.Calculator\Amazon.JSII.Tests.Calculator.csproj" />-->
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

delete

@@ -2,8 +2,9 @@
<configuration>
<packageSources>
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
<add key="jsii-dotnet-jsonmodel" value="../node_modules/jsii-dotnet-jsonmodel/bin/Release/NuGet" />
<add key="jsii-dotnet-runtime" value="../bin/Release/NuGet" />
<add key="jsii-dotnet-runtime" value="../node_modules/jsii-dotnet-runtime/bin/Release/NuGet" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like it's trying to depend on itself

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No - it's the jsii-dotnet-runtime-test depending on jsii-dotnet-runtime.

@@ -4,5 +4,4 @@
# bundle only...
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not needed (we don't "npm pack" this)

@@ -20,7 +20,7 @@ process.stdout.write(`<?xml version="1.0" encoding="UTF-8"?>
<dependency>
<groupId>software.amazon.jsii.tests</groupId>
<artifactId>calculator</artifactId>
<version>[0.5.0-beta,)</version>
<version>[0.6.2,)</version>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should come from package.json

@@ -1,8 +1,14 @@
import childProcess = require('child_process');
import fs = require('fs-extra');
import jsiiDotNetJsonModel = require('jsii-dotnet-jsonmodel');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This must be within try-catch because it's a devDependency

@RomainMuller RomainMuller merged commit a1ee1de into master Aug 8, 2018
@RomainMuller RomainMuller deleted the pirocchi/build branch August 8, 2018 09:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants