Skip to content

Commit 2fa4516

Browse files
pombredannepombredanne
authored
Merge pull request #39 from nexB/win-38
Do not crash for Win forms projects
2 parents f6a915a + 8228e8a commit 2fa4516

18 files changed

+11346
-26
lines changed

‎CHANGELOG.rst‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
Changelog
22
=========
33

4+
v0.9.11
5+
--------
6+
7+
This is a minor feature update release with this update:
8+
9+
* Add Dockerfile and document dotnet requirements
10+
411

512
v0.9.10
613
--------

‎Dockerfile‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ ENV LANG=en_US.UTF-8
66
ENV LANGUAGE=en_US:en
77
ENV LC_ALL=en_US.UTF-8
88

9+
# curl and nuget/donet system dependencies for jammy
910
RUN apt-get update \
1011
&& apt-get install -y \
1112
curl \
@@ -20,17 +21,17 @@ RUN apt-get update \
2021
libunwind8 \
2122
zlib1g
2223

23-
RUN curl --location https://dot.net/v1/dotnet-install.sh \
24-
--output dotnet-install.sh \
25-
&& chmod +x dotnet-install.sh \
26-
&& ./dotnet-install.sh --channel 6.0 \
27-
&& rm dotnet-install.sh
28-
ENV DOTNET_ROOT=$HOME/.dotnet
29-
ENV PATH=$PATH:$HOME/.dotnet:$HOME/.dotnet/tools
30-
31-
ENV NI_HOME=/opt/nuget-inspector/bin
32-
ENV PATH=$PATH:$NI_HOME
33-
ARG NI_VERSION=0.9.10
24+
ENV NI_ROOT=/opt/nuget-inspector
25+
ENV NI_HOME=$NI_ROOT/bin
26+
ENV NI_DOTNET_HOME=$NI_ROOT/dotnet
27+
28+
ENV PATH=$PATH:$NI_DOTNET_HOME:$NI_DOTNET_HOME/tools:$NI_HOME
29+
30+
RUN mkdir -p $NI_DOTNET_HOME \
31+
&& curl --location https://aka.ms/dotnet/6.0/dotnet-sdk-linux-x64.tar.gz \
32+
| tar -C $NI_DOTNET_HOME -xz
33+
34+
ARG NI_VERSION=0.9.11
3435
RUN mkdir -p $NI_HOME \
3536
&& curl -L https://github.com/nexB/nuget-inspector/releases/download/v${NI_VERSION}/nuget-inspector-v${NI_VERSION}-linux-x64.tar.gz \
3637
| tar --strip-components=1 -C $NI_HOME -xz

‎Dockerfile.ubuntu18‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# syntax=docker/dockerfile:1.4
2+
3+
FROM ubuntu:bionic as base-image
4+
5+
ENV LANG=en_US.UTF-8
6+
ENV LANGUAGE=en_US:en
7+
ENV LC_ALL=en_US.UTF-8
8+
9+
# curl and nuget/donet system dependencies for jammy
10+
RUN apt-get update \
11+
&& apt-get install -y \
12+
curl \
13+
libc6 \
14+
libgcc1 \
15+
libgssapi-krb5-2 \
16+
libicu60 \
17+
libssl1.1 \
18+
libstdc++6 \
19+
zlib1g
20+
21+
ENV NI_ROOT=/opt/nuget-inspector
22+
ENV NI_HOME=$NI_ROOT/bin
23+
ENV NI_DOTNET_HOME=$NI_ROOT/dotnet
24+
25+
ENV PATH=$PATH:$NI_DOTNET_HOME:$NI_DOTNET_HOME/tools:$NI_HOME
26+
27+
RUN mkdir -p $NI_DOTNET_HOME \
28+
&& curl --location https://aka.ms/dotnet/6.0/dotnet-sdk-linux-x64.tar.gz \
29+
| tar -C $NI_DOTNET_HOME -xz
30+
31+
# ARG NI_VERSION=0.9.11
32+
# RUN mkdir -p $NI_HOME \
33+
# && curl -L https://github.com/nexB/nuget-inspector/releases/download/v${NI_VERSION}/nuget-inspector-v${NI_VERSION}-linux-x64.tar.gz \
34+
# | tar --strip-components=1 -C $NI_HOME -xz
35+
36+
RUN mkdir -p $NI_HOME
37+
ADD ./build/ $NI_HOME
38+
39+
ENTRYPOINT ["/opt/nuget-inspector/bin/nuget-inspector"]

‎README.rst‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ style of .NET and NuGet projects and package layouts, manifests and lockfiles.
3030
Usage
3131
--------
3232

33+
- Install the dotnet SDK 6.x for your platform from Microsoft
34+
https://learn.microsoft.com/en-us/dotnet/core/install/
35+
3336
- Download and extract the pre-built binary release archive from the release page
3437
https://github.com/nexB/nuget-inspector for your operating system. (Linux-only
3538
for now)
@@ -119,5 +122,6 @@ Here are credits for some of these key projects without which it would not exist
119122
https://github.com/Dropcraft/Dropcraft
120123

121124
These projects are used either in the built executables, at build time or for
122-
testing. The built executables are designed to be self-contained exes that do
123-
not require additional libraries to run on the target system.
125+
testing (a large number are used for testing). The built executables are designed
126+
to be self-contained exes that do not require additional libraries to run on the
127+
target system, beyond a dotnet SDK.

‎build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ dotnet publish \
1717
--runtime linux-x64 \
1818
--self-contained true \
1919
--configuration Release \
20-
-p:Version=0.9.10 \
20+
-p:Version=0.9.11 \
2121
--output build \
2222
src/nuget-inspector/nuget-inspector.csproj

‎release.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
rm -rf release/
1717
mkdir release
1818

19-
VERSION=0.9.10
19+
VERSION=0.9.11
2020

2121
TARGET_BASE=nuget-inspector-$(git describe)
2222

‎setup.cfg‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[bumpversion]
22
commit = False
33
tag = False
4-
current_version = 0.9.10
4+
current_version = 0.9.11
55
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?
66
serialize =
77
{major}.{minor}.{patch}-{release}
@@ -15,6 +15,10 @@ serialize =
1515

1616
[bumpversion:file:src/nuget-inspector/nuget-inspector.csproj]
1717

18+
[bumpversion:file:Dockerfile]
19+
20+
[bumpversion:file:Dockerfile.ubuntu18]
21+
1822
[metadata]
1923
name = nuget-inspector-test-suite
2024
license = Apache-2.0 AND MIT

‎src/nuget-inspector/Config.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ public static class Config
99
public static bool TRACE_DEEP = false;
1010
public static bool TRACE_META = false;
1111
public static bool TRACE_OUTPUT = false;
12-
public const string NUGET_INSPECTOR_VERSION = "0.9.10";
12+
public const string NUGET_INSPECTOR_VERSION = "0.9.11";
1313
#pragma warning restore CA2211
1414
}

‎src/nuget-inspector/nuget-inspector.csproj‎

Lines changed: 38 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,46 @@
2323
<PackageId>nuget-inspector</PackageId>
2424
<Product>nuget-inspector</Product>
2525
<AssemblyName>nuget-inspector</AssemblyName>
26-
<Version>0.9.10</Version>
26+
27+
<Version>0.9.11</Version>
28+
<AssemblyVersion>0.9.11.0</AssemblyVersion>
29+
<FileVersion>0.9.11.0</FileVersion>
30+
2731
<Authors>nexB Inc.</Authors>
2832
<Company>nexB Inc</Company>
29-
<AssemblyVersion>0.9.10.0</AssemblyVersion>
30-
<FileVersion>0.9.10.0</FileVersion>
31-
<Description>A NuGet and Dotnet package dependency resolver</Description>
32-
<PackageProjectUrl>https://github.com/nexB/nuget-inspector</PackageProjectUrl>
33-
<PackageLicenseUrl>Apache-2.0 AND MIT</PackageLicenseUrl>
34-
<RepositoryUrl>https://github.com/nexB/nuget-inspector</RepositoryUrl>
3533
<Copyright>Copyright (c) nexB Inc. and others.</Copyright>
34+
35+
<PackageProjectUrl>https://github.com/nexB/nuget-inspector</PackageProjectUrl>
36+
<Description>A NuGet and Dotnet package dependency resolver</Description>
37+
<PackageTags>nuget, dependencies, dependency, resolver, dotnet, csproj, linux, windows, macos</PackageTags>
38+
39+
<PackageLicenseExpression>Apache-2.0 AND MIT</PackageLicenseExpression>
40+
<PackageLicenseUrl>https://raw.githubusercontent.com/nexB/nuget-inspector/main/NOTICE</PackageLicenseUrl>
41+
<PackageLicenseFile>../NOTICE</PackageLicenseFile>
42+
43+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
44+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
3645
<RepositoryType>git</RepositoryType>
37-
<PackageTags>nuget dependencies</PackageTags>
46+
<RepositoryUrl>https://github.com/nexB/nuget-inspector</RepositoryUrl>
47+
3848
</PropertyGroup>
3949

50+
51+
<ItemGroup>
52+
<None Include="../NOTICE" Pack="true" PackagePath="NOTICE"/>
53+
<None Include="../AUTHORS.rst" Pack="true" PackagePath="AUTHORS.rst"/>
54+
<None Include="../mit.LICENSE" Pack="true" PackagePath="mit.LICENSE"/>
55+
<None Include="../apache-2.0.LICENSE" Pack="true" PackagePath="apache-2.0.LICENSE"/>
56+
<None Include="../CHANGELOG.rst" Pack="true" PackagePath="CHANGELOG.rst"/>
57+
<None Include="../README.rst" Pack="true" PackagePath="README.rst"/>
58+
</ItemGroup>
59+
60+
<!-- production dependencies -->
4061
<ItemGroup>
41-
<PackageReference Include="Microsoft.Build" Version="17.3.2" />
4262
<PackageReference Include="Microsoft.Build.Locator" Version="1.4.10-g38d95f4814" />
63+
<PackageReference Include="Microsoft.Build" Version="17.3.2" />
4364
<!--
65+
<PackageReference Include="Microsoft.Build.Framework" Version="17.3.2" />
4466
<PackageReference Include="Microsoft.Build.Runtime" Version="17.3.2" />
4567
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.3.2"/>
4668
-->
@@ -58,6 +80,13 @@
5880
<PackageReference Include="NuGet.Resolver" Version="6.4.0" />
5981
<PackageReference Include="NuGet.Versioning" Version="6.4.0" />
6082
<PackageReference Include="packageurl-dotnet" Version="1.2.0" />
83+
84+
</ItemGroup>
85+
86+
<!-- development dependencies
87+
<ItemGroup>
88+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
6189
</ItemGroup>
90+
-->
6291

6392
</Project>

‎tests/data/basic/includes/ClientApiLib/ClientApiLib.csproj‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net4.8</TargetFramework>
5+
</PropertyGroup>
6+
7+
</Project>

0 commit comments

Comments
 (0)