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.

Sign up for GitHub

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

Jump to bottom

fix(dotnet/analyzer): remove dependency on Runtime #927

Merged
merged 5 commits into from
Nov 5, 2019
Merged

fix(dotnet/analyzer): remove dependency on Runtime #927

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f22c9a0
fix(dotnet/analyzer): remove dependency on Runtime
RomainMuller Oct 31, 2019
b417705
relax runtime version constraint
RomainMuller Nov 4, 2019
3e9c2da
Merge branch 'master' into rmuller/analyzer-dependency
RomainMuller Nov 4, 2019
bc59e08
fix test expectations
RomainMuller Nov 5, 2019
5d2ed53
Merge branch 'master' into rmuller/analyzer-dependency
RomainMuller Nov 5, 2019
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
6 changes: 2 additions & 4 deletions packages/jsii-dotnet-analyzers/src/Amazon.JSII.Analyzers/Amazon.JSII.Analyzers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../NuGet.Metadata.props" />

<PropertyGroup>
Expand All @@ -10,9 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Amazon.JSII.Runtime" Version="$(JsiiVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis" Version="3.2.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.2.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.2.0" PrivateAssets="all" />
Copy link
Contributor

Choose a reason for hiding this comment

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

Not sure why this needs to be PrivateAssets="all".

Copy link
Contributor Author

@RomainMuller RomainMuller Nov 4, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

This is part of the (Microsoft-authored) tutorial I have found... So I fixed it up to match... I reckon the reason is that the compiler actually comes with it's own and it's better to not pollute, but I could be wrong.

The reference code from Microsoft's tutorial is here:

https://github.com/dotnet/samples/blob/7b8490d7c76c8e7d73f80883b10c166967f171dd/csharp/roslyn-sdk/Tutorials/MakeConst/MakeConst/MakeConst.csproj#L26

</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion packages/jsii-dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@


Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Amazon.JSII.Runtime.IntegrationTests", "Amazon.JSII.Runtime.IntegrationTests\Amazon.JSII.Runtime.IntegrationTests.csproj", "{CE3CAFBD-25F8-422D-925A-8F9CCEA1F548}"
Expand Down
3 changes: 2 additions & 1 deletion ...culatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
<EmbeddedResource Include="scope-jsii-calc-base-0.20.0.tgz" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Amazon.JSII.Runtime" Version="0.20.0" />
<PackageReference Include="Amazon.JSII.Runtime" Version="[0.20.0]" />
RomainMuller marked this conversation as resolved.
Show resolved Hide resolved
<PackageReference Include="Amazon.JSII.Analyzers" Version="[0.20.0]" />
<PackageReference Include="Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId" Version="0.20.0" />
</ItemGroup>
</Project>
Expand Down
3 changes: 2 additions & 1 deletion ...alculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
<EmbeddedResource Include="scope-jsii-calc-lib-0.20.0.tgz" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Amazon.JSII.Runtime" Version="0.20.0" />
<PackageReference Include="Amazon.JSII.Runtime" Version="[0.20.0]" />
<PackageReference Include="Amazon.JSII.Analyzers" Version="[0.20.0]" />
<PackageReference Include="Amazon.JSII.Tests.CalculatorPackageId.BasePackageId" Version="0.20.0" />
</ItemGroup>
</Project>
Expand Down
3 changes: 2 additions & 1 deletion ...dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
<EmbeddedResource Include="jsii-calc-0.20.0.tgz" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Amazon.JSII.Runtime" Version="0.20.0" />
<PackageReference Include="Amazon.JSII.Runtime" Version="[0.20.0]" />
<PackageReference Include="Amazon.JSII.Analyzers" Version="[0.20.0]" />
<PackageReference Include="Amazon.JSII.Tests.CalculatorPackageId.BasePackageId" Version="0.20.0" />
<PackageReference Include="Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId" Version="0.20.0" />
<PackageReference Include="Amazon.JSII.Tests.CalculatorPackageId.LibPackageId" Version="0.20.0-devpreview" />
Expand Down