Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion scenarios/macos/mac_net_aspire/mac_net_aspire.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
class MacNetAspire(core.app_scenario.Scenario):

module = __module__.split('.')[-1]
prep_version = "7"
prep_version = "8"
resources = module + "_resources"


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,19 @@ if [ "$PYTHON_VERSION" != "3.12.10" ]; then
fi
log "✓ Python version confirmed: $PYTHON_VERSION"

# -------------------------------------------------------------------
# Regenerate ConfigurationSchema.json files
# -------------------------------------------------------------------
# The Aspire repo validates that checked-in ConfigurationSchema.json files match
# what the installed SDK generates. A plain build fails validation if they differ.
# The Aspire CI runs with /p:UpdateConfigurationSchema=true to regenerate them
# before validation. We do the same here during prep so that subsequent run
# iterations (which use plain --build) pass cleanly.
log "-- Regenerating ConfigurationSchema.json files"
cd $BIN_DIR/aspire
./build.sh --restore --build /p:UpdateConfigurationSchema=true
check_status "ConfigurationSchema regeneration"

log ""
log "✓ All checks passed"
log "-- net_aspire prep completed successfully"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -221,5 +221,18 @@ dotnet restore Aspire.slnx
check($lastexitcode)
" Restore completed successfully" | log

# -------------------------------------------------------------------
# Regenerate ConfigurationSchema.json files
# -------------------------------------------------------------------
# The Aspire repo validates that checked-in ConfigurationSchema.json files match
# what the installed SDK generates. A plain 'dotnet build' fails validation if they
# differ. The Aspire CI pipeline runs with /p:UpdateConfigurationSchema=true to
# regenerate them before the validation check. We do the same here during prep so
# that subsequent run iterations (which use plain 'dotnet build') pass cleanly.
"-- Regenerating ConfigurationSchema.json files" | log
dotnet build Aspire.slnx --no-incremental /p:UpdateConfigurationSchema=true
check($lastexitcode)
" ConfigurationSchema regeneration completed" | log

"-- net_aspire prep completed ($logSuffix version)" | log
Exit 0