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

Nuget package changes: Use a meta-package, rename to runtime, remove other DLLs and EXEs #9

Merged
merged 9 commits into from
Jul 25, 2020
Merged

Nuget package changes: Use a meta-package, rename to runtime, remove other DLLs and EXEs #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d30b8ed
Changes for meta-package with runtime
jefgen Jul 16, 2020
f9489ab
Change encoding
jefgen Jul 16, 2020
e38537d
Fix JSON and signing
jefgen Jul 16, 2020
de9a189
Change to use normal Nuget deps instead of the runtime.json method.
jefgen Jul 24, 2020
0f72e92
Lowercase the ARM64 package name.
jefgen Jul 24, 2020
3bd403e
Removed previous all-in-one Nuget package files.
jefgen Jul 24, 2020
70e9471
Change the name. Add note.
jefgen Jul 24, 2020
7315c99
Code review.
jefgen Jul 24, 2020
d87ed0d
Change requireLicenseAcceptance.
jefgen Jul 24, 2020
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
40 changes: 0 additions & 40 deletions build/nuget/Microsoft.icu.icu4c.win.targets
View file
Open in desktop

This file was deleted.

34 changes: 34 additions & 0 deletions build/nuget/SignConfig-ICU-Binaries-runtime.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8" ?>
<SignConfigXML>
<!-- Note: We use the AuthenticodeFormer cert as we have made modifcations to the code. -->
<job platform="x86" certSubject="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
configuration="Release" dest="__OUTPATHROOT__\signed" jobname="Code Sign MS-ICU binaries (x86)" approvers="">
<!-- DLLs -->
<!-- Data library -->
<file src="__INPATHROOT__\icudt*.dll" signType="AuthenticodeFormer" />
<!-- Common library -->
<file src="__INPATHROOT__\icuuc*.dll" signType="AuthenticodeFormer" />
<!-- i18n library -->
<file src="__INPATHROOT__\icuin*.dll" signType="AuthenticodeFormer" />
</job>
<job platform="x64" certSubject="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
configuration="Release" dest="__OUTPATHROOT__\signed" jobname="Code Sign MS-ICU binaries (x64)" approvers="">
<!-- DLLs -->
<!-- Data library -->
<file src="__INPATHROOT__\icudt*.dll" signType="AuthenticodeFormer" />
<!-- Common library -->
<file src="__INPATHROOT__\icuuc*.dll" signType="AuthenticodeFormer" />
<!-- i18n library -->
<file src="__INPATHROOT__\icuin*.dll" signType="AuthenticodeFormer" />
</job>
<job platform="ARM64" certSubject="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
configuration="Release" dest="__OUTPATHROOT__\signed" jobname="Code Sign MS-ICU binaries (ARM64)" approvers="">
<!-- DLLs -->
<!-- Data library -->
<file src="__INPATHROOT__\icudt*.dll" signType="AuthenticodeFormer" />
<!-- Common library -->
<file src="__INPATHROOT__\icuuc*.dll" signType="AuthenticodeFormer" />
<!-- i18n library -->
<file src="__INPATHROOT__\icuin*.dll" signType="AuthenticodeFormer" />
</job>
</SignConfigXML>
103 changes: 0 additions & 103 deletions build/nuget/SignConfig-ICU-Binaries.xml
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion build/nuget/SignConfig-ICU-Nuget.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@

<job platform="AnyCPU" configuration="Release" certSubject="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
dest="__OUTPATHROOT__\signed" jobname="Code Sign MS-ICU Nuget" approvers="">
<file src="__INPATHROOT__\Microsoft.icu.*.nupkg" signType="Nuget" />
<file src="__INPATHROOT__\Microsoft.ICU.*.nupkg" signType="Nuget" />
<file src="__INPATHROOT__\runtime.win-arm64.Microsoft.ICU.*.nupkg" signType="Nuget" />
<file src="__INPATHROOT__\runtime.win-x64.Microsoft.ICU.*.nupkg" signType="Nuget" />
<file src="__INPATHROOT__\runtime.win-x86.Microsoft.ICU.*.nupkg" signType="Nuget" />
</job>

</SignConfigXML>
21 changes: 11 additions & 10 deletions ...t/Template-Microsoft.icu.icu4c.win.nuspec → build/nuget/Template-runtime-meta.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>$id$</id>
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>$runtimePackageId$</id>
<version>$version$</version>
<authors>Microsoft</authors>
<license type="file">LICENSE</license>
<projectUrl>https://github.com/microsoft/icu</projectUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<summary>Pre-built Windows binaries of ICU4C</summary>
<description>This package contains pre-built binaries of ICU4C for Windows from the Microsoft ICU (MS-ICU) repo on GitHub.
<projectUrl>https://github.com/microsoft/icu</projectUrl>
<description>This package contains pre-built binaries of ICU4C using the Microsoft ICU (MS-ICU) repo on GitHub.

ICU4C is a mature, widely used set of C/C++ libraries providing Unicode and Globalization support for software applications.
The MS-ICU repo contains a modified version of ICU4C with changes for security, maintenance, and data changes for Microsoft usage.

The MS-ICU repo contains a modified version of ICU4C with changes for security, maintenance, data changes for Microsoft usage, as well as minor changes for the Windows OS build of ICU4C.

These binaries are built using the MSVC compiler and require the VC Redist to be installed.
This runtime package only contains the common, i18n, and data libraries for ICU4C.

Note: In order to have binary compatibility between versions see: https://aka.ms/icu-binary-compatibility
</description>
<releaseNotes>https://aka.ms/ms-icu-nuget-release-notes</releaseNotes>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<tags>native nativepackage icu icu4c</tags>
<dependencies>
$deps$
</dependencies>
</metadata>
</package>
16 changes: 16 additions & 0 deletions build/nuget/Template-runtime-rid.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>$runtimePackageId$</id>
<version>$version$</version>
<authors>Microsoft</authors>
<license type="file">LICENSE</license>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<projectUrl>https://github.com/microsoft/icu</projectUrl>
<description>Internal implementation package not meant for direct consumption. Please do not reference directly.
This package contains pre-built binaries of MS-ICU.
When using NuGet 3.x this package requires at least version 3.4.</description>
<releaseNotes>https://aka.ms/ms-icu-nuget-release-notes</releaseNotes>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
</metadata>
</package>
Loading