Skip to content

Commit dca5db8

Browse files
jefgenjefgen
authored
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.
2 parents e5d2294 + eac8178 commit dca5db8

File tree

193 files changed

+265
-2488
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

193 files changed

+265
-2488
lines changed

‎build/nuget/Microsoft.icu.icu4c.win.targets‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎build/nuget/SignConfig-ICU-Binaries-runtime.xml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<SignConfigXML>
3+
<!-- Note: We use the AuthenticodeFormer cert as we have made modifcations to the code. -->
4+
<job platform="x86" certSubject="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
5+
configuration="Release" dest="__OUTPATHROOT__\signed" jobname="Code Sign MS-ICU binaries (x86)" approvers="">
6+
<!-- DLLs -->
7+
<!-- Data library -->
8+
<file src="__INPATHROOT__\icudt*.dll" signType="AuthenticodeFormer" />
9+
<!-- Common library -->
10+
<file src="__INPATHROOT__\icuuc*.dll" signType="AuthenticodeFormer" />
11+
<!-- i18n library -->
12+
<file src="__INPATHROOT__\icuin*.dll" signType="AuthenticodeFormer" />
13+
</job>
14+
<job platform="x64" certSubject="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
15+
configuration="Release" dest="__OUTPATHROOT__\signed" jobname="Code Sign MS-ICU binaries (x64)" approvers="">
16+
<!-- DLLs -->
17+
<!-- Data library -->
18+
<file src="__INPATHROOT__\icudt*.dll" signType="AuthenticodeFormer" />
19+
<!-- Common library -->
20+
<file src="__INPATHROOT__\icuuc*.dll" signType="AuthenticodeFormer" />
21+
<!-- i18n library -->
22+
<file src="__INPATHROOT__\icuin*.dll" signType="AuthenticodeFormer" />
23+
</job>
24+
<job platform="ARM64" certSubject="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
25+
configuration="Release" dest="__OUTPATHROOT__\signed" jobname="Code Sign MS-ICU binaries (ARM64)" approvers="">
26+
<!-- DLLs -->
27+
<!-- Data library -->
28+
<file src="__INPATHROOT__\icudt*.dll" signType="AuthenticodeFormer" />
29+
<!-- Common library -->
30+
<file src="__INPATHROOT__\icuuc*.dll" signType="AuthenticodeFormer" />
31+
<!-- i18n library -->
32+
<file src="__INPATHROOT__\icuin*.dll" signType="AuthenticodeFormer" />
33+
</job>
34+
</SignConfigXML>

‎build/nuget/SignConfig-ICU-Binaries.xml‎

Lines changed: 0 additions & 103 deletions
This file was deleted.

‎build/nuget/SignConfig-ICU-Nuget.xml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33

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

912
</SignConfigXML>

build/nuget/Template-Microsoft.icu.icu4c.win.nuspec renamed to build/nuget/Template-runtime-meta.nuspec

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
1-
<?xml version="1.0"?>
2-
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
3-
<metadata>
4-
<id>$id$</id>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
3+
<metadata minClientVersion="2.12">
4+
<id>$runtimePackageId$</id>
55
<version>$version$</version>
66
<authors>Microsoft</authors>
77
<license type="file">LICENSE</license>
8-
<projectUrl>https://github.com/microsoft/icu</projectUrl>
98
<requireLicenseAcceptance>true</requireLicenseAcceptance>
10-
<summary>Pre-built Windows binaries of ICU4C</summary>
11-
<description>This package contains pre-built binaries of ICU4C for Windows from the Microsoft ICU (MS-ICU) repo on GitHub.
9+
<projectUrl>https://github.com/microsoft/icu</projectUrl>
10+
<description>This package contains pre-built binaries of ICU4C using the Microsoft ICU (MS-ICU) repo on GitHub.
1211

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

15-
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.
16-
17-
These binaries are built using the MSVC compiler and require the VC Redist to be installed.
15+
This runtime package only contains the common, i18n, and data libraries for ICU4C.
1816

1917
Note: In order to have binary compatibility between versions see: https://aka.ms/icu-binary-compatibility
2018
</description>
2119
<releaseNotes>https://aka.ms/ms-icu-nuget-release-notes</releaseNotes>
2220
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
2321
<tags>native nativepackage icu icu4c</tags>
22+
<dependencies>
23+
$deps$
24+
</dependencies>
2425
</metadata>
2526
</package>

‎build/nuget/Template-runtime-rid.nuspec‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
3+
<metadata minClientVersion="2.12">
4+
<id>$runtimePackageId$</id>
5+
<version>$version$</version>
6+
<authors>Microsoft</authors>
7+
<license type="file">LICENSE</license>
8+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
9+
<projectUrl>https://github.com/microsoft/icu</projectUrl>
10+
<description>Internal implementation package not meant for direct consumption. Please do not reference directly.
11+
This package contains pre-built binaries of MS-ICU.
12+
When using NuGet 3.x this package requires at least version 3.4.</description>
13+
<releaseNotes>https://aka.ms/ms-icu-nuget-release-notes</releaseNotes>
14+
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
15+
</metadata>
16+
</package>

0 commit comments

Comments
 (0)