Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<SetupRoot>$(RepoRoot)</SetupRoot>
<SourceDir>$(SetupRoot)src/</SourceDir>
<SigningToolsDir>$(SetupRoot)eng\signing\</SigningToolsDir>
<LicenseFile>$(RepoRoot)LICENSE</LicenseFile>
<LicenseFile>$(RepoRoot)LICENSE.txt</LicenseFile>

<!-- Output directories -->
<BinDir Condition="'$(BinDir)'==''">$(ArtifactsBinDir)</BinDir>
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/managed/CommonManaged.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<IncludeSymbols>true</IncludeSymbols>
<Serviceable>true</Serviceable>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageLicenseFile>LICENSE.TXT</PackageLicenseFile>
<PackageProjectUrl>https://dot.net</PackageProjectUrl>
<Authors>Microsoft</Authors>
<NugetLicenseFile>$(RepoRoot)$(PackageLicenseFile)</NugetLicenseFile>
Expand Down
4 changes: 2 additions & 2 deletions src/pkg/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
</PropertyGroup>

<PropertyGroup>
<PackageLicenseFile>$(RepoRoot)LICENSE</PackageLicenseFile>
<PackageLicenseFile>$(RepoRoot)LICENSE.TXT</PackageLicenseFile>
<PackageThirdPartyNoticesFile>$(RepoRoot)THIRD-PARTY-NOTICES.TXT</PackageThirdPartyNoticesFile>
<LicenseUrl>https://github.com/dotnet/core-setup/blob/master/LICENSE</LicenseUrl>
<LicenseUrl>https://github.com/dotnet/core-setup/blob/master/LICENSE.TXT</LicenseUrl>
<PackageDescriptionFile>$(SetupRoot)src/pkg/projects/descriptions.json</PackageDescriptionFile>
<!-- This link should be updated for each release milestone, currently this points to 1.0.0 -->
<ReleaseNotes>https://go.microsoft.com/fwlink/?LinkID=799417</ReleaseNotes>
Expand Down
2 changes: 1 addition & 1 deletion src/pkg/packaging/installers.proj
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<Copy SourceFiles="$(RepoRoot)THIRD-PARTY-NOTICES.TXT"
DestinationFiles="$(SharedHostPublishRoot)ThirdPartyNotices.txt" />

<Copy SourceFiles="$(RepoRoot)LICENSE"
<Copy SourceFiles="$(ProjectDir)LICENSE.TXT"
DestinationFiles="$(SharedHostPublishRoot)LICENSE.txt"
Condition="'$(TargetsUnix)' == 'true'"/>

Expand Down