Add zoneinfo data for System.Runtime.TimeZoneInfoTests - #38219

Merged

tqiu8 merged 13 commits into

dotnet:masterfrom

tqiu8:add-zoneinfo-data

Jul 7, 2020

tqiu8 commented Jun 22, 2020 •

edited

Loading

Contributor

added --enable-zoneinfo flags to WasmRunnerTemplate.sh as well as wasm/sample/Makefile
added package reference to System.Runtime.TestData
allows all TimeZoneInfo tests with System.TimeZoneNotFoundException to pass, ~100 tests


          Add zoneinfo data for System.Runtime.TimeZoneInfoTests

b8f7d77

- added --enable-zoneinfo flags to WasmRunnerTemplate.sh as well as wasm/sample/Makefile
- added package reference to System.Runtime.TestData

tqiu8 requested review from akoeplinger, lewing, safern and vargaz

June 22, 2020 17:41

tqiu8 requested review from EgorBo, marek-safar and steveisok as code owners

June 22, 2020 17:41

Dotnet-GitSync-Bot commented Jun 22, 2020

Collaborator

I couldn't figure out the best area label to add to this PR. Please help me learn by adding exactly one area label.

tqiu8 added the area-Infrastructure-libraries label

ghost commented Jun 22, 2020

Tagging subscribers to this area: @safern, @ViktorHofer
Notify danmosemsft if you want to be subscribed.

safern reviewed

View reviewed changes

eng/testing/WasmRunnerTemplate.sh Outdated

safern reviewed

View reviewed changes

src/mono/wasm/runtime-test.js Outdated

safern reviewed

View reviewed changes

src/mono/netcore/sample/wasm/Makefile Outdated

safern reviewed

View reviewed changes

src/mono/netcore/sample/wasm/WasmSample.csproj Outdated

safern reviewed

View reviewed changes

src/mono/netcore/sample/wasm/WasmSample.csproj Outdated


          Remove --enable-zoneinfo from WasmRunnerTemplate.sh and remove extra …

0eed88b

…references/logs

marek-safar reviewed

View reviewed changes

src/mono/netcore/sample/wasm/Program.cs Outdated

src/mono/netcore/sample/wasm/WasmSample.csproj Outdated


          Remove extra imports and references from WasmSample

619a90e

safern commented Jun 25, 2020

Member

@tqiu8 the PR to add WASM test runs in CI was just merged so you should be able to rebase on top of master and address: #38219 (comment)

Also, with this fix, are there any test failures left in System.Runtime.Tests?

tqiu8 commented Jun 25, 2020

Contributor Author

@safern I was gonna go a different route and just have the timezone data included in the runtime pack instead of using the package reference.

safern commented Jun 25, 2020

Member

Is that going to be the end-to-end scenario for customers?

tqiu8 commented Jun 25, 2020

Contributor Author

@safern I think it's a temporary solution that will eventually be merged with katelyn's icu work. @lewing

safern reviewed

View reviewed changes

eng/Versions.props Outdated


          Switch from loading timezonedata from runtime-assets to including dot…

ac91ed2

…net.timezones.blat in runtime pack

Remove edits to WasmSample makefile
Remove package references to System.Runtime.TestData

tqiu8 force-pushed the add-zoneinfo-data branch from 7625d7d to ac91ed2 Compare

June 29, 2020 19:15

tqiu8 added 2 commits

June 29, 2020 16:32


          Adding enable-zoneinfo the runscriptcommand

cc90aa1


          Merge branch 'master' into add-zoneinfo-data

ad48243

safern commented Jun 29, 2020

Member

Should we enable more test assemblies that were impacted by this?

lewing requested changes

View reviewed changes

src/mono/wasm/runtime/library_mono.js Outdated

src/mono/wasm/runtime/library_mono.js Outdated

src/mono/wasm/runtime/library_mono.js Outdated


          Incorporate PR feedback, make mono_wasm_load_data more general

3398c38

tqiu8 requested a review from lewing

July 1, 2020 19:14


          Merge branch 'master' into add-zoneinfo-data

d181957

safern reviewed

View reviewed changes

eng/testing/tests.mobile.targets Outdated

safern reviewed

View reviewed changes

eng/testing/tests.mobile.targets Outdated


          Merge branch 'master' into add-zoneinfo-data

1d73801

lewing reviewed

View reviewed changes

src/mono/wasm/runtime/library_mono.js Outdated


          Replace prefix

bf9fdb8

Co-authored-by: Larry Ewing <lewing@microsoft.com>

tqiu8 requested a review from lewing

July 2, 2020 19:01

lewing reviewed

View reviewed changes

src/mono/wasm/runtime/library_mono.js Outdated

src/mono/wasm/runtime/library_mono.js Outdated

tqiu8 added 3 commits

July 6, 2020 13:59


          Correct tests.mobile.targets

6dd3be1


          Pr feedback:

f91a069

- Correct tests.mobile.targets
- Hardcode magic number
- Make folder depth variable


          Merge branch 'master' into add-zoneinfo-data

e968204

lewing approved these changes

View reviewed changes

safern approved these changes

View reviewed changes

tqiu8 merged commit 19d221b into dotnet:master

akoeplinger reviewed

View reviewed changes

src/mono/wasm/Makefile

Comment on lines +115 to +116

		timezone-data:
		cp runtime/dotnet.timezones.blat $(BUILDS_BIN_DIR)

akoeplinger Jul 7, 2020

Member

nit in case you touch this again: this should ideally use the filename as the target name instead so make's dependency tracking works (right now it always copies the file even if it's already there:

$(BUILDS_BIN_DIR)/dotnet.timezones.blat: runtime/dotnet.timezones.blat
	cp runtime/dotnet.timezones.blat $@

(the $@ is a special variable that means the target filename: https://www.gnu.org/software/make/manual/html_node/Automatic-Variables.html)

tqiu8 Jul 8, 2020

Contributor Author

good to know. i can open another pr with this. thank you!

ghost locked as resolved and limited conversation to collaborators

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

Labels

area-Infrastructure-libraries