During what war did the movie The Sound of Music take place?

The Sound of Music is set in Austria during the lead-up to World War II, specifically in 1938, when Austria was annexed by Nazi Germany.