Skip to content

Commit ae1ada7

Browse files
committed
Port all .NET ICU changes to new release
1 parent f24b668 commit ae1ada7

File tree

149 files changed

+16623
-42
lines changed

Some content is hidden

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

149 files changed

+16623
-42
lines changed

.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -349,3 +349,7 @@ MigrationBackup/
349349

350350
# Ionide (cross platform F# VS Code tools) working folder
351351
.ionide/
352+
353+
# dotnet/arcade folders
354+
.dotnet/
355+
.packages/

Directory.Build.props

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
4+
5+
<PropertyGroup>
6+
<PackageRID>$(TargetOS.ToLowerInvariant())-$(TargetArchitecture)</PackageRID>
7+
</PropertyGroup>
8+
</Project>

Directory.Build.targets

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
4+
</Project>

NuGet.config

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<solution>
4+
<add key="disableSourceControlIntegration" value="true" />
5+
</solution>
6+
<packageSources>
7+
<clear />
8+
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
9+
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
10+
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
11+
</packageSources>
12+
<disabledPackageSources>
13+
<clear />
14+
</disabledPackageSources>
15+
</configuration>

README.md

+1-42
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,3 @@
11
# ICU (MS-ICU)
22

3-
> See the official [International Components for Unicode](http://site.icu-project.org/) site for an introduction to ICU.
4-
5-
This repository is a fork of the [ICU](https://github.com/unicode-org/icu) project (specifically ICU4C) with changes. This fork is maintained by the Microsoft Global Foundations team.
6-
7-
The changes in this repository fall into the following broad categories:
8-
- Maintenance related changes.
9-
- Changes needed for consumption inside various Microsoft products.
10-
- Additional locales from CLDR to improve parity with existing NLS locale support, and changes to address customer issues and feedback.
11-
12-
Before reporting any issues, or creating any pull-request(s), please ensure that your issue or change is related to one of the above reasons.
13-
14-
Any other issues, changes, bug fixes, improvements, enhancements, etc. should be made in the upstream project here:
15-
- Upstream source: https://github.com/unicode-org/icu
16-
- Upstream issues: https://unicode-org.atlassian.net/projects/ICU
17-
18-
## Build Status
19-
20-
[![Build Status](https://dev.azure.com/ms/icu/_apis/build/status/microsoft/CI?branchName=master)](https://dev.azure.com/ms/icu/_build/latest?definitionId=367&branchName=master)
21-
22-
## Contributing
23-
24-
> 👉 Note: Please make sure your change(s) cannot be made upstream first.
25-
26-
Most bug fixes, improvements, enhancements, etc. should be made in the upstream project here: https://github.com/unicode-org/icu
27-
28-
Otherwise, this project welcomes contributions and suggestions. Most contributions require you to agree to a
29-
Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us
30-
the rights to use your contribution. For details, visit https://cla.opensource.microsoft.com.
31-
32-
When you submit a pull request, a CLA bot will automatically determine whether you need to provide
33-
a CLA and decorate the PR appropriately (e.g., status check, comment). Simply follow the instructions
34-
provided by the bot. You will only need to do this once across all repos using our CLA.
35-
36-
## Code of Conduct
37-
38-
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
39-
For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or
40-
contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
41-
42-
## License
43-
44-
The contents of this repository are licensed under the terms described in the [LICENSE](LICENSE) file.
3+
This is a fork of https://github.com/microsoft/icu for enabling dotnet on WebAssembly.

build.sh

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#!/usr/bin/env bash
2+
3+
source="${BASH_SOURCE[0]}"
4+
5+
# resolve $SOURCE until the file is no longer a symlink
6+
while [[ -h $source ]]; do
7+
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
8+
source="$(readlink "$source")"
9+
10+
# if $source was a relative symlink, we need to resolve it relative to the path where the
11+
# symlink file was located
12+
[[ $source != /* ]] && source="$scriptroot/$source"
13+
done
14+
15+
usage()
16+
{
17+
echo "Common settings:"
18+
echo " --tracing Enable ICU tracing"
19+
echo " --help Print help and exit (short: -h)"
20+
echo ""
21+
}
22+
23+
inner_args=
24+
properties=
25+
26+
while [[ $# > 0 ]]; do
27+
opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')"
28+
case "$opt" in
29+
-help|-h)
30+
usage
31+
exit 0
32+
;;
33+
-tracing)
34+
properties="$properties /p:IcuTracing=true"
35+
;;
36+
*)
37+
inner_args="$inner_args $1"
38+
;;
39+
esac
40+
shift
41+
done
42+
43+
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
44+
45+
"$scriptroot/eng/common/build.sh" --build --restore $inner_args $properties

eng/Build.props

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<ProjectToBuild Include="$(MSBuildThisFileDirectory)icu.proj" />
5+
</ItemGroup>
6+
</Project>

eng/Publishing.props

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
<PropertyGroup>
4+
<PublishingVersion>3</PublishingVersion>
5+
</PropertyGroup>
6+
</Project>

eng/SignCheckExclusionsFile.txt

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
;; Exclusions for SignCheck.
2+
;; Format: https://github.com/dotnet/arcade/blob/397316e195639450b6c76bfeb9823b40bee72d6d/src/SignCheck/Microsoft.SignCheck/Verification/Exclusion.cs#L23-L35
3+
4+
Microsoft.NETCore.Runtime.ICU.Transport.*.nupkg;;Transport package which does not get signed

eng/Tools.props

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<Project>
2+
<PropertyGroup>
3+
<MSBuildTreatWarningsAsErrors>false</MSBuildTreatWarningsAsErrors>
4+
</PropertyGroup>
5+
6+
<ItemGroup>
7+
<!-- arcade -->
8+
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingVersion)" />
9+
</ItemGroup>
10+
</Project>
11+

eng/Version.Details.xml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Dependencies>
3+
<ProductDependencies>
4+
</ProductDependencies>
5+
<ToolsetDependencies>
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22255.2">
7+
<Uri>https://github.com/dotnet/arcade</Uri>
8+
<Sha>ba1c3aff4be864c493031d989259ef92aaa23fc3</Sha>
9+
</Dependency>
10+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22255.2">
11+
<Uri>https://github.com/dotnet/arcade</Uri>
12+
<Sha>ba1c3aff4be864c493031d989259ef92aaa23fc3</Sha>
13+
</Dependency>
14+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22255.2">
15+
<Uri>https://github.com/dotnet/arcade</Uri>
16+
<Sha>ba1c3aff4be864c493031d989259ef92aaa23fc3</Sha>
17+
</Dependency>
18+
</ToolsetDependencies>
19+
</Dependencies>

eng/Versions.props

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<VersionPrefix>7.0.0</VersionPrefix>
5+
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
6+
<PreReleaseVersionIteration>5</PreReleaseVersionIteration>
7+
</PropertyGroup>
8+
<PropertyGroup>
9+
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22255.2</MicrosoftDotNetBuildTasksPackagingVersion>
10+
</PropertyGroup>
11+
</Project>

0 commit comments

Comments
 (0)