-
Notifications
You must be signed in to change notification settings - Fork 48
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #12: Update maint-67 for the Taiwan calendar changes.
This change merges the Taiwan calendar changes (PR #8) and the runtime Nuget changes (PR #9) into the maint/maint-67 branch. The version number has been bumped to 67.1.0.2 for these changes. Note: To preserve the history of the commits, this change will need to be merged as a "merge commit", rather than the usual squash merge approach.
- Loading branch information
Showing
193 changed files
with
265 additions
and
2,488 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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> |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 11 additions & 10 deletions
21
...t/Template-Microsoft.icu.icu4c.win.nuspec → build/nuget/Template-runtime-meta.nuspec
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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> |
Oops, something went wrong.