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

[build] Include MIT license in most NuGet packages #8787

Merged
merged 1 commit into from
Mar 6, 2024
Merged

[build] Include MIT license in most NuGet packages #8787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions LICENSE → LICENSE.TXT
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
Xamarin.Android SDK

The MIT License (MIT)

Copyright (c) .NET Foundation Contributors
Copyright (c) .NET Foundation and Contributors

All rights reserved.

Expand All @@ -23,4 +21,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

3 changes: 1 addition & 2 deletions build-tools/create-packs/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
<Target Name="_SetGlobalProperties">
<ItemGroup>
<_GlobalProperties Include="-p:Configuration=$(Configuration)" />
<_GlobalProperties Include="-p:NuGetLicense=$(NuGetLicense)" />
<_GlobalProperties Include="-p:IncludeSymbols=False" />
</ItemGroup>
</Target>
Expand Down Expand Up @@ -103,7 +102,7 @@
/>
<!-- The .nupkg contains the files under /data/, so we need to move them -->
<ItemGroup>
<_WLExtractedFiles Include="$(_SdkManifestsFolder)temp\LICENSE" />
<_WLExtractedFiles Include="$(_SdkManifestsFolder)temp\LICENSE.TXT" />
<_WLExtractedFiles Include="$(_SdkManifestsFolder)temp\data\*" />
</ItemGroup>
<Move SourceFiles="@(_WLExtractedFiles)" DestinationFolder="$(_SdkManifestsFolder)microsoft.net.sdk.android" />
Expand Down
6 changes: 3 additions & 3 deletions build-tools/create-packs/License.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<!-- Ownership and LICENSE settings for .nupkg's -->
<!-- Ownership and LICENSE.TXT settings for .nupkg's -->
<Project>
<PropertyGroup>
<Authors>Microsoft</Authors>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
<PackageProjectUrl>https://github.com/xamarin/xamarin-android</PackageProjectUrl>
<NuGetLicense Condition="Exists('$(XamarinAndroidSourcePath)external\monodroid\tools\scripts\License.txt')">$(XamarinAndroidSourcePath)external\monodroid\tools\scripts\License.txt</NuGetLicense>
<NuGetLicense Condition=" '$(NuGetLicense)' == '' ">$(XamarinAndroidSourcePath)LICENSE</NuGetLicense>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<NuGetLicense Condition=" '$(NuGetLicense)' == '' or '$(PackageId)' != 'Microsoft.Android.Sdk.$(HostOS)' ">$(XamarinAndroidSourcePath)LICENSE.TXT</NuGetLicense>
<PackageLicenseFile>LICENSE.TXT</PackageLicenseFile>
<BeforePack>_GetLicense;$(BeforePack)</BeforePack>
</PropertyGroup>
<Target Name="_GetLicense">
Expand Down