Skip to content

Commit a21c4ea

Browse files
License / Documentation cleanup (DataDog#357)
- Edit whitespace on LICENSE so hopefully GitHub will auto-recognize the license as Apache 2.0 - Change all instances of "dd-trace-csharp" to "dd-trace-dotnet" - For NuGet packages, change PackageLicenseUrl (which is being deprecated) to License and correctly specify Apache-2.0 - Fix instructions for doing a Windows command line build
1 parent 7b0a608 commit a21c4ea

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

Diff for: LICENSE

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
Apache License
23
Version 2.0, January 2004
34
http://www.apache.org/licenses/
@@ -198,4 +199,4 @@
198199
distributed under the License is distributed on an "AS IS" BASIS,
199200
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200201
See the License for the specific language governing permissions and
201-
limitations under the License.
202+
limitations under the License.

Diff for: NOTICE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Datadog .NET Tracer for APM (dd-trace-csharp)
1+
Datadog .NET Tracer for APM (dd-trace-dotnet)
22
Copyright 2018 Datadog, Inc.
33

44
This product includes software developed at Datadog (https://www.datadoghq.com/).

Diff for: README.md

+7-4
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ Linux integration tests | [![Build Status](https://dev.azure.com/datadog-
4343
- Individual components
4444
- .NET Framework 4.7 targeting pack
4545
- [.NET Core 2.1 SDK](https://dotnet.microsoft.com/download/dotnet-core/2.1)
46+
- Optional: [nuget.exe CLI](https://www.nuget.org/downloads) v3.4.4 or newer
4647
- Optional: [WiX Toolset 3.11.1](http://wixtoolset.org/releases/) or newer to build Windows installer (msi)
4748
- Requires .NET Framework 3.5 SP2 (install from Windows Features control panel: `OptionalFeatures.exe`)
4849
- [WiX Toolset VS2017 Extension](https://marketplace.visualstudio.com/items?itemName=RobMensching.WixToolsetVisualStudio2017Extension) to build installer from VS2017
@@ -57,15 +58,17 @@ From a _Developer Command Prompt for VS 2017_:
5758

5859
```cmd
5960
rem Restore NuGet packages
60-
dotnet restore Datadog.Trace.sln
61+
rem nuget.exe is required for command line restore because msbuild doesn't support packages.config
62+
rem (see https://github.com/NuGet/Home/issues/7386)
63+
nuget restore Datadog.Trace.sln
6164
6265
rem Build C# projects (Platform: always AnyCPU)
6366
msbuild Datadog.Trace.proj /t:BuildCsharp /p:Configuration=Release;Platform=AnyCPU
6467
6568
rem Build NuGet packages
66-
dotnet pack src/Datadog.Trace/Datadog.Trace.csproj
67-
dotnet pack src/Datadog.Trace.OpenTracing/Datadog.Trace.OpenTracing.csproj
68-
dotnet pack src/Datadog.Trace.ClrProfiler.Managed/Datadog.Trace.ClrProfiler.Managed.csproj
69+
dotnet pack src\Datadog.Trace\Datadog.Trace.csproj
70+
dotnet pack src\Datadog.Trace.OpenTracing\Datadog.Trace.OpenTracing.csproj
71+
dotnet pack src\Datadog.Trace.ClrProfiler.Managed\Datadog.Trace.ClrProfiler.Managed.csproj
6972
7073
rem Build C++ projects (Platform: x64 or x86)
7174
msbuild Datadog.Trace.proj /t:BuildCpp /p:Configuration=Release;Platform=x64

Diff for: deploy/Datadog.Trace.ClrProfiler.WindowsInstaller/build.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Start-Process -NoNewWindow -Wait -FilePath "${Env:ProgramFiles(x86)}\WiX Toolset
1313
$args = @(
1414
".\output\Product.wixobj",
1515
".\output\WixUI_InstallDir_Custom.wixobj",
16-
"-out", "output\dd-trace-csharp.msi",
16+
"-out", "output\dd-trace-dotnet.msi",
1717
"-ext", "WixUIExtension"
1818
)
1919

Diff for: src/Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<IsPackable>true</IsPackable>
99
<PackageIconUrl>https://github.com/DataDog/dd-trace-dotnet/raw/master/datadog-logo-64x64.png</PackageIconUrl>
1010
<PackageProjectUrl>https://docs.datadoghq.com/tracing/setup/dotnet/</PackageProjectUrl>
11-
<PackageLicenseUrl>https://github.com/DataDog/dd-trace-dotnet/blob/master/LICENSE</PackageLicenseUrl>
11+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
1212
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
1313
<PackageReleaseNotes>See release notes at https://github.com/DataDog/dd-trace-dotnet/releases</PackageReleaseNotes>
1414
<PackageTags>Datadog;APM;tracing;profiling;instrumentation</PackageTags>

0 commit comments

Comments
 (0)