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

Rename iOS-sim to iOSSimulator, #93

Merged
merged 1 commit into from
Mar 17, 2021
Merged

Rename iOS-sim to iOSSimulator, #93

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
10 changes: 5 additions & 5 deletions eng/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ stages:
vmImage: macOS-10.15
steps:
- bash: |
./build.sh --ci --restore --build --configuration $(_BuildConfig) /p:TargetOS=iOS-sim /p:TargetArchitecture=x64 $(_InternalBuildArgs)
./build.sh --ci --restore --build --configuration $(_BuildConfig) /p:TargetOS=iOS-sim /p:TargetArchitecture=x86 $(_InternalBuildArgs)
./build.sh --ci --restore --build --configuration $(_BuildConfig) /p:TargetOS=iOS-sim /p:TargetArchitecture=arm64 $(_InternalBuildArgs)
./build.sh --ci --restore --build --configuration $(_BuildConfig) /p:TargetOS=iOSSimulator /p:TargetArchitecture=x64 $(_InternalBuildArgs)
./build.sh --ci --restore --build --configuration $(_BuildConfig) /p:TargetOS=iOSSimulator /p:TargetArchitecture=x86 $(_InternalBuildArgs)
./build.sh --ci --restore --build --configuration $(_BuildConfig) /p:TargetOS=iOSSimulator /p:TargetArchitecture=arm64 $(_InternalBuildArgs)
./build.sh --ci --restore --build --configuration $(_BuildConfig) /p:TargetOS=iOS /p:TargetArchitecture=arm64 $(_InternalBuildArgs)
./build.sh --ci --restore --build --configuration $(_BuildConfig) /p:TargetOS=iOS /p:TargetArchitecture=arm $(_InternalBuildArgs)
### delete this entry after https://github.com/dotnet/runtime/pull/49305 is merged ##
Expand All @@ -81,8 +81,8 @@ stages:
vmImage: macOS-10.15
steps:
- bash: |
./build.sh --ci --restore --build --configuration $(_BuildConfig) /p:TargetOS=tvOS-sim /p:TargetArchitecture=x64 $(_InternalBuildArgs)
./build.sh --ci --restore --build --configuration $(_BuildConfig) /p:TargetOS=tvOS-sim /p:TargetArchitecture=arm64 $(_InternalBuildArgs)
./build.sh --ci --restore --build --configuration $(_BuildConfig) /p:TargetOS=tvOSSimulator /p:TargetArchitecture=x64 $(_InternalBuildArgs)
./build.sh --ci --restore --build --configuration $(_BuildConfig) /p:TargetOS=tvOSSimulator /p:TargetArchitecture=arm64 $(_InternalBuildArgs)
./build.sh --ci --restore --build --configuration $(_BuildConfig) /p:TargetOS=tvOS /p:TargetArchitecture=arm64 $(_InternalBuildArgs)
### delete this entry after https://github.com/dotnet/runtime/pull/49305 is merged ##
./build.sh --ci --restore --build --configuration $(_BuildConfig) /p:TargetOS=tvOS /p:TargetArchitecture=x64 $(_InternalBuildArgs)
Expand Down
0 eng/icu.ios-sim.mk → eng/icu.iossimulator.mk
View file
Open in desktop
File renamed without changes.
0 eng/icu.tvos-sim.mk → eng/icu.tvossimulator.mk
View file
Open in desktop
File renamed without changes.
60 changes: 30 additions & 30 deletions eng/nuget/Microsoft.NETCore.Runtime.ICU.Transport.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,28 +92,28 @@
<File Include="$(RepoRoot)\artifacts\bin\icu-ios-x86\*.dat" TargetPath="runtimes\ios-x86\native\lib\%(Filename).dat" SkipPackageFileCheck="true" />
</ItemGroup>

<ItemGroup Condition="'$(AddAllTargetOSToPackage)' == 'true' or '$(PackageRID)' == 'ios-sim-x64'">
<File Include="$(RepoRoot)\artifacts\bin\icu-ios-sim-x64\lib\libicui18n.a" TargetPath="runtimes\ios-sim-x64\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-ios-sim-x64\lib\libicuuc.a" TargetPath="runtimes\ios-sim-x64\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-ios-sim-x64\lib\libicudata.a" TargetPath="runtimes\ios-sim-x64\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-ios-sim-x64\include\**" TargetPath="runtimes\ios-sim-x64\native\include\%(RecursiveDir)%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-ios-sim-x64\*.dat" TargetPath="runtimes\ios-sim-x64\native\lib\%(Filename).dat" SkipPackageFileCheck="true" />
<ItemGroup Condition="'$(AddAllTargetOSToPackage)' == 'true' or '$(PackageRID)' == 'iossimulator-x64'">
<File Include="$(RepoRoot)\artifacts\bin\icu-iossimulator-x64\lib\libicui18n.a" TargetPath="runtimes\iossimulator-x64\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-iossimulator-x64\lib\libicuuc.a" TargetPath="runtimes\iossimulator-x64\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-iossimulator-x64\lib\libicudata.a" TargetPath="runtimes\iossimulator-x64\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-iossimulator-x64\include\**" TargetPath="runtimes\iossimulator-x64\native\include\%(RecursiveDir)%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-iossimulator-x64\*.dat" TargetPath="runtimes\iossimulator-x64\native\lib\%(Filename).dat" SkipPackageFileCheck="true" />
</ItemGroup>

<ItemGroup Condition="'$(AddAllTargetOSToPackage)' == 'true' or '$(PackageRID)' == 'ios-sim-x86'">
<File Include="$(RepoRoot)\artifacts\bin\icu-ios-sim-x86\lib\libicui18n.a" TargetPath="runtimes\ios-sim-x86\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-ios-sim-x86\lib\libicuuc.a" TargetPath="runtimes\ios-sim-x86\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-ios-sim-x86\lib\libicudata.a" TargetPath="runtimes\ios-sim-x86\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-ios-sim-x86\include\**" TargetPath="runtimes\ios-sim-x86\native\include\%(RecursiveDir)%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-ios-sim-x86\*.dat" TargetPath="runtimes\ios-sim-x86\native\lib\%(Filename).dat" SkipPackageFileCheck="true" />
<ItemGroup Condition="'$(AddAllTargetOSToPackage)' == 'true' or '$(PackageRID)' == 'iossimulator-x86'">
<File Include="$(RepoRoot)\artifacts\bin\icu-iossimulator-x86\lib\libicui18n.a" TargetPath="runtimes\iossimulator-x86\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-iossimulator-x86\lib\libicuuc.a" TargetPath="runtimes\iossimulator-x86\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-iossimulator-x86\lib\libicudata.a" TargetPath="runtimes\iossimulator-x86\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-iossimulator-x86\include\**" TargetPath="runtimes\iossimulator-x86\native\include\%(RecursiveDir)%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-iossimulator-x86\*.dat" TargetPath="runtimes\iossimulator-x86\native\lib\%(Filename).dat" SkipPackageFileCheck="true" />
</ItemGroup>

<ItemGroup Condition="'$(AddAllTargetOSToPackage)' == 'true' or '$(PackageRID)' == 'ios-sim-arm64'">
<File Include="$(RepoRoot)\artifacts\bin\icu-ios-sim-arm64\lib\libicui18n.a" TargetPath="runtimes\ios-sim-arm64\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-ios-sim-arm64\lib\libicuuc.a" TargetPath="runtimes\ios-sim-arm64\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-ios-sim-arm64\lib\libicudata.a" TargetPath="runtimes\ios-sim-arm64\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-ios-sim-arm64\include\**" TargetPath="runtimes\ios-sim-arm64\native\include\%(RecursiveDir)%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-ios-sim-arm64\*.dat" TargetPath="runtimes\ios-sim-arm64\native\lib\%(Filename).dat" SkipPackageFileCheck="true" />
<ItemGroup Condition="'$(AddAllTargetOSToPackage)' == 'true' or '$(PackageRID)' == 'iossimulator-arm64'">
<File Include="$(RepoRoot)\artifacts\bin\icu-iossimulator-arm64\lib\libicui18n.a" TargetPath="runtimes\iossimulator-arm64\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-iossimulator-arm64\lib\libicuuc.a" TargetPath="runtimes\iossimulator-arm64\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-iossimulator-arm64\lib\libicudata.a" TargetPath="runtimes\iossimulator-arm64\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-iossimulator-arm64\include\**" TargetPath="runtimes\iossimulator-arm64\native\include\%(RecursiveDir)%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-iossimulator-arm64\*.dat" TargetPath="runtimes\iossimulator-arm64\native\lib\%(Filename).dat" SkipPackageFileCheck="true" />
</ItemGroup>

<ItemGroup Condition="'$(AddAllTargetOSToPackage)' == 'true' or '$(PackageRID)' == 'ios-arm64'">
Expand Down Expand Up @@ -142,20 +142,20 @@
<File Include="$(RepoRoot)\artifacts\bin\icu-tvos-x64\*.dat" TargetPath="runtimes\tvos-x64\native\lib\%(Filename).dat" SkipPackageFileCheck="true" />
</ItemGroup>

<ItemGroup Condition="'$(AddAllTargetOSToPackage)' == 'true' or '$(PackageRID)' == 'tvos-sim-x64'">
<File Include="$(RepoRoot)\artifacts\bin\icu-tvos-sim-x64\lib\libicui18n.a" TargetPath="runtimes\tvos-sim-x64\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-tvos-sim-x64\lib\libicuuc.a" TargetPath="runtimes\tvos-sim-x64\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-tvos-sim-x64\lib\libicudata.a" TargetPath="runtimes\tvos-sim-x64\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-tvos-sim-x64\include\**" TargetPath="runtimes\tvos-sim-x64\native\include\%(RecursiveDir)%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-tvos-sim-x64\*.dat" TargetPath="runtimes\tvos-sim-x64\native\lib\%(Filename).dat" SkipPackageFileCheck="true" />
<ItemGroup Condition="'$(AddAllTargetOSToPackage)' == 'true' or '$(PackageRID)' == 'tvossimulator-x64'">
<File Include="$(RepoRoot)\artifacts\bin\icu-tvossimulator-x64\lib\libicui18n.a" TargetPath="runtimes\tvossimulator-x64\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-tvossimulator-x64\lib\libicuuc.a" TargetPath="runtimes\tvossimulator-x64\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-tvossimulator-x64\lib\libicudata.a" TargetPath="runtimes\tvossimulator-x64\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-tvossimulator-x64\include\**" TargetPath="runtimes\tvossimulator-x64\native\include\%(RecursiveDir)%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-tvossimulator-x64\*.dat" TargetPath="runtimes\tvossimulator-x64\native\lib\%(Filename).dat" SkipPackageFileCheck="true" />
</ItemGroup>

<ItemGroup Condition="'$(AddAllTargetOSToPackage)' == 'true' or '$(PackageRID)' == 'tvos-sim-arm64'">
<File Include="$(RepoRoot)\artifacts\bin\icu-tvos-sim-arm64\lib\libicui18n.a" TargetPath="runtimes\tvos-sim-arm64\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-tvos-sim-arm64\lib\libicuuc.a" TargetPath="runtimes\tvos-sim-arm64\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-tvos-sim-arm64\lib\libicudata.a" TargetPath="runtimes\tvos-sim-arm64\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-tvos-sim-arm64\include\**" TargetPath="runtimes\tvos-sim-arm64\native\include\%(RecursiveDir)%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-tvos-sim-arm64\*.dat" TargetPath="runtimes\tvos-sim-arm64\native\lib\%(Filename).dat" SkipPackageFileCheck="true" />
<ItemGroup Condition="'$(AddAllTargetOSToPackage)' == 'true' or '$(PackageRID)' == 'tvossimulator-arm64'">
<File Include="$(RepoRoot)\artifacts\bin\icu-tvossimulator-arm64\lib\libicui18n.a" TargetPath="runtimes\tvossimulator-arm64\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-tvossimulator-arm64\lib\libicuuc.a" TargetPath="runtimes\tvossimulator-arm64\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-tvossimulator-arm64\lib\libicudata.a" TargetPath="runtimes\tvossimulator-arm64\native\lib\%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-tvossimulator-arm64\include\**" TargetPath="runtimes\tvossimulator-arm64\native\include\%(RecursiveDir)%(Filename)%(Extension)" SkipPackageFileCheck="true" />
<File Include="$(RepoRoot)\artifacts\bin\icu-tvossimulator-arm64\*.dat" TargetPath="runtimes\tvossimulator-arm64\native\lib\%(Filename).dat" SkipPackageFileCheck="true" />
</ItemGroup>

<ItemGroup Condition="'$(AddAllTargetOSToPackage)' == 'true' or '$(PackageRID)' == 'tvos-arm64'">
Expand Down