Skip to content

Commit

Permalink
Make this the release branch for 6.0.4xx and bump versions.
Browse files Browse the repository at this point in the history
  • Loading branch information
rolfbjarne committed May 19, 2022
1 parent ce10c91 commit e9784af
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Make.config
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ NUGET_HARDCODED_PRERELEASE_IDENTIFIER=
# Set the NUGET_HARDCODED_PRERELEASE_BRANCH variable to the exact name for the branch the above variable should apply to (so that any other branches won't pick it up by accident).
# For the previous example, this would be "release/6.0.2xx-rc1"
# When creating a (pre) release branch from main, this must be changed from "main" to the new release branch.
NUGET_HARDCODED_PRERELEASE_BRANCH=release/6.0.3xx
NUGET_HARDCODED_PRERELEASE_BRANCH=release/6.0.4xx

# compute the alphanumeric version of the hardcoded prerelease branch
NUGET_HARDCODED_PRERELEASE_BRANCH_ALPHANUMERIC:=$(shell export LANG=C; printf "%s" "$(NUGET_HARDCODED_PRERELEASE_BRANCH)" | tr -c '[a-zA-Z0-9-]' '-')
Expand Down
10 changes: 5 additions & 5 deletions Make.versions
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ MAC_PACKAGE_VERSION=8.11.0.$(MAC_COMMIT_DISTANCE)
# WARNING: Do **not** use versions higher than the available Xcode SDK or else we will have issues with mtouch (See https://github.com/xamarin/xamarin-macios/issues/7705)
# When bumping the major macOS version in MACOS_NUGET_VERSION also update the macOS version where we execute on bots in jenkins/Jenkinsfile (in the 'node' element)

IOS_NUGET_VERSION=15.4.303
TVOS_NUGET_VERSION=15.4.303
WATCHOS_NUGET_VERSION=8.5.303
MACOS_NUGET_VERSION=12.3.303
MACCATALYST_NUGET_VERSION=15.4.303
IOS_NUGET_VERSION=15.4.400
TVOS_NUGET_VERSION=15.4.400
WATCHOS_NUGET_VERSION=8.5.400
MACOS_NUGET_VERSION=12.3.400
MACCATALYST_NUGET_VERSION=15.4.400


# Defines the default platform version if it's not specified in the TFM. The default should not change for a given .NET version:
Expand Down

5 comments on commit e9784af

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

Please sign in to comment.