Skip to content

Commit

Permalink
Integrate latest bundle from jsii:0.7.4/maintenance
Browse files Browse the repository at this point in the history
Generate NuGet.config instead of hard-coding it.
  • Loading branch information
mpiroc committed Jul 30, 2018
1 parent 5a1a277 commit 0ae578e
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 12 deletions.
1 change: 1 addition & 0 deletions packages/aws-cdk-dotnet/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ obj/
.vs/

src/

10 changes: 0 additions & 10 deletions packages/aws-cdk-dotnet/NuGet.Config

This file was deleted.

17 changes: 15 additions & 2 deletions packages/aws-cdk-dotnet/generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,21 @@ rm -rf ./src
mkdir ./src
dotnet new sln -n Amazon.CDK -o ./src

NUGET_JSONMODEL=$(node -e "console.log(path.dirname(require.resolve('jsii-dotnet-jsonmodel/package.json')))")
NUGET_GENERATOR=$(node -e "console.log(path.dirname(require.resolve('jsii-dotnet-generator/package.json')))")
NUGET_RUNTIME=$(node -e "console.log(path.dirname(require.resolve('jsii-dotnet-runtime/package.json')))")

NUGET_CONFIG_CONTENT="<?xml version=\"1.0\" encoding=\"utf-8\"?>
<configuration>
<packageSources>
<add key=\"nuget.org\" value=\"https://api.nuget.org/v3/index.json\" protocolVersion=\"3\" />
<add key=\"local-jsonmodel\" value=\"$NUGET_JSONMODEL\" />
<add key=\"local-generator\" value=\"$NUGET_GENERATOR\" />
<add key=\"local-runtime\" value=\"$NUGET_RUNTIME\" />
</packageSources>
</configuration>"
echo $NUGET_CONFIG_CONTENT > ./src/NuGet.config

AWS_CDK=../@aws-cdk
echo "Searching $AWS_CDK for jsii packages..."
for i in $( ls $AWS_CDK ); do
Expand All @@ -22,7 +37,6 @@ for i in $( ls $AWS_CDK ); do
fi
done


# Ensure that all generated projects are added to the solution.
SRC=./src
for i in $( ls $SRC ); do
Expand All @@ -31,4 +45,3 @@ for i in $( ls $SRC ); do
dotnet sln ./src/Amazon.CDK.sln add $CSPROJ
fi
done

Binary file removed vendor/jsii-0.5.0-beta+7aa9168.zip
Binary file not shown.
Binary file added vendor/jsii-0.5.0-beta+b2fa7e5.zip
Binary file not shown.

0 comments on commit 0ae578e

Please sign in to comment.