-
Notifications
You must be signed in to change notification settings - Fork 519
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/net9.0' into merge-net9.0-into-main
- Loading branch information
Showing
537 changed files
with
6,303 additions
and
5,904 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,3 +38,6 @@ provision-shared.csx | |
| mono_crash.*.json | ||
| *.binlog | ||
| .vscode | ||
| # Xcode | ||
| xcuserdata/ | ||
| .build/ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,7 @@ CURL = curl --fail --location --connect-timeout 15 $(if $(V),--verbose,--silent) | |
| # --retry-all-errors: ignore the definition of insanity and retry even for errors that seem like you'd get the same result (such as 404). This isn't the real purpose, because this will also retry errors that will get a different result (such as connection failures / resets), which apparently --retry doesn't cover. | ||
| CURL_RETRY = $(CURL) --retry 20 --retry-delay 2 --retry-all-errors | ||
|
|
||
| DOTNET_TFM=net8.0 | ||
| DOTNET_TFM=net9.0 | ||
| DOTNET_MAJOR_VERSION:=$(firstword $(subst ., ,$(subst net,,$(DOTNET_TFM)))) | ||
| # calculate commit distance and store it in a file so that we don't have to re-calculate it every time make is executed. | ||
|
|
||
|
|
@@ -140,8 +140,8 @@ endif | |
| ## | ||
| ## Note that the prerelease identifier should be as short as possible, because otherwise | ||
| ## the resulting package name can become too long for MSIs. | ||
| NUGET_HARDCODED_PRERELEASE_IDENTIFIER=net8-rtm | ||
| NUGET_HARDCODED_PRERELEASE_BRANCH=net8.0 | ||
| NUGET_HARDCODED_PRERELEASE_IDENTIFIER=net9-rtm | ||
| NUGET_HARDCODED_PRERELEASE_BRANCH=net9.0 | ||
|
|
||
| # compute the alphanumeric version of branch names | ||
| NUGET_RELEASE_BRANCH_ALPHANUMERIC:=$(shell export LANG=C; printf "%s" "$(NUGET_RELEASE_BRANCH)" | tr -c '[a-zA-Z0-9-]' '-') | ||
|
|
@@ -294,18 +294,18 @@ MAX_WATCH_SIMULATOR_VERSION=$(WATCH_SDK_VERSION) | |
|
|
||
| # Minimum OS versions for running XI/XM apps. | ||
| MIN_IOS_SDK_VERSION=11.0 | ||
| MIN_MACOS_SDK_VERSION=10.15 | ||
| MIN_MACOS_SDK_VERSION=12.0 | ||
| MIN_WATCHOS_SDK_VERSION=4.0 | ||
| MIN_WATCHOS64_32_SDK_VERSION=5.1 | ||
| MIN_WATCH_OS_VERSION=4.0 | ||
| MIN_TVOS_SDK_VERSION=11.0 | ||
| MIN_MACCATALYST_SDK_VERSION=13.1 | ||
| MIN_MACCATALYST_SDK_VERSION=15.0 | ||
|
|
||
| # Minimum OS versions for .NET 8 support | ||
| DOTNET_MIN_IOS_SDK_VERSION=11.0 | ||
| DOTNET_MIN_TVOS_SDK_VERSION=11.0 | ||
| DOTNET_MIN_MACCATALYST_SDK_VERSION=13.1 | ||
| DOTNET_MIN_MACOS_SDK_VERSION=10.15 | ||
| # Minimum OS versions for .NET 9 support | ||
| DOTNET_MIN_IOS_SDK_VERSION=12.2 | ||
| DOTNET_MIN_TVOS_SDK_VERSION=12.2 | ||
| DOTNET_MIN_MACCATALYST_SDK_VERSION=15.0 | ||
| DOTNET_MIN_MACOS_SDK_VERSION=12.0 | ||
|
|
||
| # The min simulator version available in the Xcode we're using | ||
| MIN_IOS_SIMULATOR_VERSION=15.0 | ||
|
|
@@ -669,10 +669,11 @@ TRACKING_DOTNET_RUNTIME_SEPARATELY= | |
|
|
||
| -include $(TOP)/dotnet.config | ||
| $(TOP)/dotnet.config: $(TOP)/eng/Versions.props $(TOP)/Build.props | ||
| $(Q) grep MicrosoftDotnetSdkInternalPackageVersion $(TOP)/eng/Versions.props | sed -e 's/<*\/*MicrosoftDotnetSdkInternalPackageVersion>//g' -e 's/[ \t]*/DOTNET_VERSION=/' >> [email protected] | ||
| $(Q) rm -f [email protected] | ||
| $(Q) grep '<MicrosoftNETSdkPackageVersion>' $(TOP)/eng/Versions.props | sed -e 's/<*\/*MicrosoftNETSdkPackageVersion>//g' -e 's/[ \t]*/DOTNET_VERSION=/' >> [email protected] | ||
| $(Q) grep MicrosoftNETCoreAppRefPackageVersion $(TOP)/eng/Versions.props | sed -e 's/<*\/*MicrosoftNETCoreAppRefPackageVersion>//g' -e 's/[ \t]*/BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION=/' >> [email protected] | ||
| $(Q) grep "<$$(grep EmscriptenWorkloadVersion $(TOP)/eng/Versions.props | sed -e 's_.*>$$[\(]\(.*\)[\)]<.*_\1_')>" $(TOP)/eng/Versions.props | sed -e 's/.*>\(.*\)<.*/EMSCRIPTEN_MANIFEST_PACKAGE_VERSION=\1/' >> [email protected] | ||
| $(Q) $(foreach platform,$(ALL_DOTNET_PLATFORMS),grep Microsoft$(platform)SdkPackageVersion $(TOP)/eng/Versions.props | sed -e 's/<*\/*Microsoft$(platform)SdkPackageVersion>//g' -e 's/[ \t]*/NET7_$(shell echo $(platform) | tr '[:lower:]' '[:upper:]')_NUGET_VERSION_NO_METADATA=/' >> [email protected] &&) true | ||
| $(Q) $(foreach platform,$(ALL_DOTNET_PLATFORMS),grep '<Microsoft$(platform)SdkPackageVersion>' $(TOP)/eng/Versions.props | sed -e 's/<*\/*Microsoft$(platform)SdkPackageVersion>//g' -e 's/[ \t]*/NET8_$(shell echo $(platform) | tr '[:lower:]' '[:upper:]')_NUGET_VERSION_NO_METADATA=/' >> [email protected] &&) true | ||
| $(Q) mv [email protected] $@ | ||
|
|
||
| $(TOP)/Build.props: Make.config | ||
|
|
@@ -723,7 +724,7 @@ export PATH := $(DOTNET_DIR):$(PATH) | |
| DOTNET=$(DOTNET_DIR)/dotnet | ||
| DOTNET_BCL_DIR:=$(abspath $(TOP)/packages/microsoft.netcore.app.ref/$(DOTNET_BCL_VERSION)/ref/$(DOTNET_TFM)) | ||
| ifneq ($(DOTNET_BCL_DIR),$(shell ls -1d $(DOTNET_BCL_DIR) 2>/dev/null)) | ||
| DOTNET_BCL_DIR:=$(abspath $(TOP)/packages/microsoft.netcore.app.ref/$(DOTNET_BCL_VERSION)/ref/net7.0) | ||
| DOTNET_BCL_DIR:=$(abspath $(TOP)/packages/microsoft.netcore.app.ref/$(DOTNET_BCL_VERSION)/ref/net8.0) | ||
| endif | ||
|
|
||
| # The sdk version band has the last two digits set to 0: https://github.com/dotnet/sdk/blob/22c4860dcb2cf6b123dd641cc4a87a50380759d5/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs#L52-L53 | ||
|
|
@@ -747,6 +748,9 @@ EMSCRIPTEN_MANIFEST_VERSION_BAND=$(DOTNET_MANIFEST_VERSION_BAND_WITH_PRERELEASE_ | |
| # It should typically be $(DOTNET_MANIFEST_VERSION_BAND_WITH_PRERELEASE_COMPONENT), unless we decide to hardcode it to something else | ||
| MACIOS_MANIFEST_VERSION_BAND=$(DOTNET_MANIFEST_VERSION_BAND_WITH_PRERELEASE_COMPONENT) | ||
|
|
||
| # Set this to 1 if the Microsoft.NETCore.App.Ref dependency in eng/Version.Details.xml does *not* specify a CoherentParentDependency on VS.Tools.Net.Core.SDK.Resolver. | ||
| TRACKING_DOTNET_RUNTIME_SEPARATELY= | ||
|
|
||
| # The location of csc changes depending on whether we're using a preview or a stable/service release :/ | ||
| DOTNET_CSC_PATH_PREVIEW=$(DOTNET_DIR)/sdk/$(DOTNET_VERSION)/Roslyn/bincore/csc.dll | ||
| DOTNET_CSC_PATH_STABLE=$(DOTNET_DIR)/sdk/$(DOTNET_VERSION_BAND)/Roslyn/bincore/csc.dll | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| --- | ||
| title: .NET for iOS, Mac Catalyst, macOS, and tvOS Build Items | ||
| description: .NET for iOS, Mac Catalyst, macOS, and tvOS Build Items | ||
| ms.date: 09/19/2024 | ||
| --- | ||
|
|
||
| # Build Items | ||
|
|
||
| Build items control how .NET for iOS, Mac Catalyst, macOS, and tvOS | ||
| application or library projects are built. | ||
|
|
||
| ## XcodeProject | ||
|
|
||
| `<XcodeProject>` can be used to build and consume the outputs | ||
| of Xcode framework projects created in Xcode or elsewehere. | ||
|
|
||
| The `Include` metadata should point to the path of the XCODEPROJ file to be built. | ||
|
|
||
| ```xml | ||
| <ItemGroup> | ||
| <XcodeProject Include="path/to/MyProject.xcodeproj" SchemeName="MyLibrary" /> | ||
| </ItemGroup> | ||
| ``` | ||
|
|
||
| The following MSBuild metadata are supported: | ||
|
|
||
| - `%(SchemeName)`: The name of the build scheme or target that should be used to build the project. | ||
|
|
||
| - `%(Configuration)`: The name of the configuration to use to build the project. | ||
| The default value is `Release`. | ||
|
|
||
| - `%(CreateNativeReference)`: Output XCFRAMEWORK files will be added as a `@(NativeReference)` to the project. | ||
| Metadata supported by `@(NativeReference)` like `%(Kind)`, `%(Frameworks)`, or `%(SmartLink)` will be forwarded if set. | ||
| The default value is `true`. | ||
|
|
||
| - `%(OutputPath)`: Can be set to override the XCARCHIVE and XCFRAMEWORK output path of the Xcode project. | ||
| The default value is `$(IntermediateOutputPath)xcode/{SchemeName}-{Hash}`. | ||
|
|
||
| This build action was introduced in .NET 9. |
Oops, something went wrong.