xamarin
/
xamarin-macios
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[dotnet] Bump to .NET 6.0.100-alpha.1.20556.2. and net6.0 

New commits in spouliot/Touch.Unit:

* spouliot/Touch.Unit@f8768d9 Advance into the world of net6.0

Diff: 9abe69e6f5..f8768d99ef
This commit is contained in:
Rolf Bjarne Kvinge 2020-09-18 17:41:33 +02:00
Родитель 42bec7dfa0
Коммит c640775699
102 изменённых файлов: 182 добавлений и 183 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
.gitignore поставляемый
Просмотреть файл

@ -30,8 +30,7 @@ tests/bcl-test/Mac\ OS\ X\ BCL\ \tests*.csproj
tests/bcl-test/mscorlib*.csproj
tests/bcl-test/SystemCoreXunit*.csproj
tests/bcl-test/SystemXunit.csproj
global.json
global5.json
global*.json
.idea
device-tests-provisioning.csx
mono_crash.*.json

16
Make.config
Просмотреть файл

@ -440,17 +440,17 @@ DOTNET_NUPKG_DIR ?= $(DOTNET_DESTDIR)/nupkgs
DOTNET_PKG_DIR ?= $(DOTNET_DESTDIR)/pkgs
DOTNET_FEED_DIR ?= $(DOTNET_DESTDIR)/nuget-feed
# Configuration for .NET 5.
# Configuration for .NET 6.
# We're using preview versions, and there will probably be many of them, so install locally (into builds/downloads) if there's no system version to
# avoid consuming a lot of disk space (since they're never automatically deleted). The system-dependencies.sh script will install locally as long
# as there's a TARBALL url.
DOTNET5_VERSION=5.0.100-rtm.20509.5
DOTNET5_VERSION_BAND=$(firstword $(subst -, ,$(DOTNET5_VERSION)))
DOTNET5_URL=https://dotnetcli.blob.core.windows.net/dotnet/Sdk/5.0.100-rtm.20509.5/dotnet-sdk-5.0.100-rtm.20509.5-osx-x64.pkg
DOTNET5_TARBALL=https://dotnetcli.blob.core.windows.net/dotnet/Sdk/5.0.100-rtm.20509.5/dotnet-sdk-5.0.100-rtm.20509.5-osx-x64.tar.gz
DOTNET5_TARBALL_NAME=$(notdir $(DOTNET5_TARBALL))
DOTNET5_DIR=$(abspath $(TOP)/builds/downloads/$(basename $(basename $(DOTNET5_TARBALL_NAME))))
DOTNET5=$(DOTNET5_DIR)/dotnet
DOTNET6_VERSION=6.0.100-alpha.1.20559.4
DOTNET6_VERSION_BAND=$(firstword $(subst -, ,$(DOTNET6_VERSION)))
DOTNET6_URL=https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.100-alpha.1.20559.4/dotnet-sdk-6.0.100-alpha.1.20559.4-osx-x64.pkg
DOTNET6_TARBALL=https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.100-alpha.1.20559.4/dotnet-sdk-6.0.100-alpha.1.20559.4-osx-x64.tar.gz
DOTNET6_TARBALL_NAME=$(notdir $(DOTNET6_TARBALL))
DOTNET6_DIR=$(abspath $(TOP)/builds/downloads/$(basename $(basename $(DOTNET6_TARBALL_NAME))))
DOTNET6=$(DOTNET6_DIR)/dotnet
DOTNET5_BCL_REF_URL=https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/7d9f5c21-0d79-403f-bfe3-9a4506529760/nuget/v3/flat2/microsoft.netcore.app.ref/5.0.0-rc.1.20404.16/microsoft.netcore.app.ref.5.0.0-rc.1.20404.16.nupkg
DOTNET5_BCL_REF_NAME=microsoft.netcore.app.ref.5.0.0-rc.1.20404.16.nupkg
DOTNET5_BCL_DIR:=$(abspath $(TOP)/builds/downloads/$(basename $(DOTNET5_BCL_REF_NAME)))/ref/net5.0

6
Makefile
Просмотреть файл

@ -53,15 +53,15 @@ ifdef INCLUDE_IOS
@echo Validated file permissions for Xamarin.iOS.
endif
all-local:: global.json global5.json
all-local:: global.json global6.json
global.json: Make.config Makefile
$(Q) printf "{\n\t\"sdk\": {\n\t\t\"version\": \"$(DOTNET_VERSION)\"\n\t}\n}\n" > $@
# This tells NuGet to use the exact same dotnet version we've configured in Make.config
global5.json: $(TOP)/Make.config.inc Makefile $(TOP)/.git/HEAD $(TOP)/.git/index
global6.json: $(TOP)/Make.config.inc Makefile $(TOP)/.git/HEAD $(TOP)/.git/index
$(Q_GEN) \
printf "{\n" > $@; \
printf "\t\"sdk\": { \"version\": \"$(DOTNET5_VERSION)\" },\n" >> $@; \
printf "\t\"sdk\": { \"version\": \"$(DOTNET6_VERSION)\" },\n" >> $@; \
printf "\t\"msbuild-sdks\": {\n" >> $@; \
printf "\t\t\"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk\": \"5.0.0-beta.20120.1\"\n" >> $@; \
printf "\t}\n}\n" >> $@

6
builds/Makefile
Просмотреть файл

@ -16,7 +16,7 @@ download-mono: downloads/$(basename $(MONO_IOS_FILENAME)) downloads/$(basename $
downloads/$(basename $(MONO_IOS_FILENAME)): MONO_URL=$(MONO_IOS_URL)
downloads/$(basename $(MONO_MAC_FILENAME)): MONO_URL=$(MONO_MAC_URL)
downloads/$(DOTNET5_BCL_REF_NAME): MONO_URL=$(DOTNET5_BCL_REF_URL)
downloads/$(DOTNET5_TARBALL_NAME): MONO_URL=$(DOTNET5_TARBALL)
downloads/$(DOTNET6_TARBALL_NAME): MONO_URL=$(DOTNET6_TARBALL)
include $(TOP)/mk/colors.mk
@ -24,7 +24,7 @@ DOWNLOADS = \
downloads/$(MONO_IOS_FILENAME) \
downloads/$(MONO_MAC_FILENAME) \
downloads/$(DOTNET5_BCL_REF_NAME) \
downloads/$(DOTNET5_TARBALL_NAME) \
downloads/$(DOTNET6_TARBALL_NAME) \
# This target downloads the mono archives, there's one for Xamarin.iOS and one for Xamarin.Mac.
# If doing many clean builds, it's possible to copy the downloaded zip file to ~/Library/Caches/xamarin-macios
@ -85,7 +85,7 @@ downloads/%: downloads/%.nupkg
DOTNET_DOWNLOADS = \
downloads/$(basename $(DOTNET5_BCL_REF_NAME)) \
downloads/$(basename $(basename $(DOTNET5_TARBALL_NAME))) \
downloads/$(basename $(basename $(DOTNET6_TARBALL_NAME))) \
dotnet: $(DOTNET_DOWNLOADS)
ifdef ENABLE_DOTNET

14
dotnet/Makefile
Просмотреть файл

@ -3,8 +3,8 @@ TOP = ..
include $(TOP)/Make.config
include $(TOP)/mk/rules.mk
DOTNET_MANIFESTS_PATH=$(DOTNET5_DIR)/sdk-manifests/$(DOTNET5_VERSION_BAND)
DOTNET_PACKS_PATH=$(DOTNET5_DIR)/packs
DOTNET_MANIFESTS_PATH=$(DOTNET6_DIR)/sdk-manifests/$(DOTNET6_VERSION_BAND)
DOTNET_PACKS_PATH=$(DOTNET6_DIR)/packs
TMP_PKG_DIR=_pkg
# Create variables prefixed with the correctly cased platform name from the upper-cased platform name. This makes some of the next sections somewhat simpler.
@ -124,7 +124,7 @@ define CreateNuGetTemplate
nupkgs/$(1).$(2)+$(NUGET_BUILD_METADATA).nupkg: $(TEMPLATED_FILES) $(3) package/$(1)/package.csproj $(wildcard package/*.csproj) $(wildcard $(DOTNET_DESTDIR)/$(1)/* $(DOTNET_DESTDIR)/$(1)/*/* $(DOTNET_DESTDIR)/$(1)/*/*/* $(DOTNET_DESTDIR)/$(1)/*/*/*/*) global.json
@# Delete any versions of the nuget we're building
$$(Q) rm -f nupkgs/$(1).*.nupkg
$$(Q_PACK) $(DOTNET5) pack package/$(1)/package.csproj --output "$$(dir $$@)" $(DOTNET_PACK_VERBOSITY)
$$(Q_PACK) $(DOTNET6) pack package/$(1)/package.csproj --output "$$(dir $$@)" $(DOTNET_PACK_VERBOSITY)
@# Nuget pack doesn't add the metadata to the filename, but we want that, so rename nuget to contain the full name
$$(Q) mv "nupkgs/$(1).$(2).nupkg" "$$@"
@# Clean the local feed
@ -191,7 +191,7 @@ define CreatePackage
# The workload package
$(TMP_PKG_DIR)/Microsoft.$1.Workload.$2.pkg: $($(1)_NUGET_TARGETS) $(WORKLOAD_TARGETS) Makefile | $(TMP_PKG_DIR)
$$(Q) rm -f $$@
$$(Q_GEN) pkgbuild --quiet --version '$2' --root Microsoft.NET.Workload.$1 --component-plist PackageInfo.plist --install-location /usr/local/share/dotnet/sdk-manifests/$(DOTNET5_VERSION_BAND)/Microsoft.NET.Workload.$1 --identifier com.microsoft.net.$3.workload.pkg $$@.tmp
$$(Q_GEN) pkgbuild --quiet --version '$2' --root Microsoft.NET.Workload.$1 --component-plist PackageInfo.plist --install-location /usr/local/share/dotnet/sdk-manifests/$(DOTNET6_VERSION_BAND)/Microsoft.NET.Workload.$1 --identifier com.microsoft.net.$3.workload.pkg $$@.tmp
$$(Q) mv $$@.tmp $$@
# The sdk package
@ -227,10 +227,10 @@ PACKAGE_TARGETS += $(DOTNET_PKG_DIR)/Microsoft.$1.Bundle.$2.pkg
$(TMP_PKG_DIR)/Microsoft.$1.Bundle.$2.zip: $($(1)_NUGET_TARGETS) $(WORKLOAD_TARGETS) Makefile $(REF_PACK_$(4)) $(SDK_PACK_$(4)) | $(TMP_PKG_DIR)
$$(Q) rm -rf $$@ $$@.tmpdir $$@.tmp
$$(Q) mkdir -p $$@.tmpdir/dotnet/sdk-manifests/$(DOTNET5_VERSION_BAND)/
$$(Q) mkdir -p $$@.tmpdir/dotnet/sdk-manifests/$(DOTNET6_VERSION_BAND)/
$$(Q) mkdir -p $$@.tmpdir/dotnet/packs/Microsoft.$1.Sdk
$$(Q) mkdir -p $$@.tmpdir/dotnet/packs/Microsoft.$1.Ref
$$(Q) $(CP) -r Microsoft.NET.Workload.$1 $$@.tmpdir/dotnet/sdk-manifests/$(DOTNET5_VERSION_BAND)/
$$(Q) $(CP) -r Microsoft.NET.Workload.$1 $$@.tmpdir/dotnet/sdk-manifests/$(DOTNET6_VERSION_BAND)/
$$(Q) $(CP) -r $(DOTNET_DESTDIR)/Microsoft.$1.Sdk $$@.tmpdir/dotnet/packs/Microsoft.$1.Sdk/$2
$$(Q) $(CP) -r $(DOTNET_DESTDIR)/Microsoft.$1.Ref $$@.tmpdir/dotnet/packs/Microsoft.$1.Ref/$2
$$(Q_GEN) cd $$@.tmpdir && zip -9rq $$(abspath $$@.tmp) .
@ -275,7 +275,7 @@ all-local:: $(TARGETS) targets/Xamarin.Shared.Sdk.Versions.targets
endif
# This tells NuGet to use the exact same dotnet version we've configured in Make.config
global.json: $(TOP)/global5.json
global.json: $(TOP)/global6.json
$(CP) $< $@
clean-local::

10
dotnet/package/common.csproj
Просмотреть файл

@ -2,7 +2,7 @@
<Import Project="../targets/Xamarin.Shared.Sdk.Versions.targets" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<IncludeBuildOutput>false</IncludeBuildOutput>
<PackageVersion>$(_PackageVersion)</PackageVersion>
<RepositoryUrl>https://github.com/xamarin/xamarin-macios</RepositoryUrl>
@ -45,12 +45,12 @@
<!-- https://github.com/dotnet/runtime/blob/0647ec314948904319da5eb15e9931f7c85ed1e2/src/installer/pkg/projects/Directory.Build.targets#L281 -->
<PropertyGroup Condition="'$(_CreateFrameworkList)' == 'true'">
<_FrameworkListFile>$(_packagePath)data/FrameworkList.xml</_FrameworkListFile>
<_PackTargetPath>ref/net5.0</_PackTargetPath>
<_PackTargetPath>ref/net6.0</_PackTargetPath>
<_PackNativePath>runtimes/$(_RuntimeIdentifier)/native</_PackNativePath>
</PropertyGroup>
<PropertyGroup Condition="'$(_CreateRuntimeList)' == 'true'">
<_FrameworkListFile>$(_packagePath)data/RuntimeList.xml</_FrameworkListFile>
<_PackTargetPath>runtimes/$(_RuntimeIdentifier)/lib/net5.0</_PackTargetPath>
<_PackTargetPath>runtimes/$(_RuntimeIdentifier)/lib/net6.0</_PackTargetPath>
<_PackNativePath>runtimes/$(_RuntimeIdentifier)/native</_PackNativePath>
</PropertyGroup>
<ItemGroup>
@ -62,9 +62,9 @@
<ItemGroup>
<!-- Hardcode framework attributes -->
<_FrameworkListRootAttributes Include="Name" Value="Microsoft $(_PlatformName) - NET 5.0" />
<_FrameworkListRootAttributes Include="Name" Value="Microsoft $(_PlatformName) - NET 6.0" />
<_FrameworkListRootAttributes Include="TargetFrameworkIdentifier" Value=".NETCoreApp" />
<_FrameworkListRootAttributes Include="TargetFrameworkVersion" Value="5.0" />
<_FrameworkListRootAttributes Include="TargetFrameworkVersion" Value="6.0" />
<_FrameworkListRootAttributes Include="FrameworkName" Value="Microsoft.$(_PlatformName)" />
<_PackageFiles Include="$(_FrameworkListFile)" PackagePath="data" />

4
dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets
Просмотреть файл

@ -61,7 +61,7 @@
<ItemGroup>
<KnownFrameworkReference Include="Microsoft.$(_PlatformName)"
TargetFramework="net5.0"
TargetFramework="net6.0"
RuntimeFrameworkName="Microsoft.$(_PlatformName)"
DefaultRuntimeFrameworkVersion="$(_ShortPackageVersion)"
LatestRuntimeFrameworkVersion="$(_ShortPackageVersion)"
@ -84,7 +84,7 @@
-->
<ItemGroup Condition="'$(_PlatformName)' == 'macOS'">
<KnownFrameworkReference Include="Microsoft.NETCore.App.Mono"
TargetFramework="netcoreapp5.0"
TargetFramework="net6.0"
RuntimeFrameworkName="Microsoft.NETCore.App.Mono"
DefaultRuntimeFrameworkVersion="$(BundledNETCorePlatformsPackageVersion)"
LatestRuntimeFrameworkVersion="$(BundledNETCorePlatformsPackageVersion)"

2
dotnet/targets/Xamarin.Shared.Sdk.targets
Просмотреть файл

@ -311,7 +311,7 @@
<_XamarinRefPackageDirectory>%(_XamarinFrameworkReference.TargetingPackPath)</_XamarinRefPackageDirectory>
<_XamarinNativeLibraryDirectory>$(_XamarinSdkRuntimePackDirectory)/runtimes/$(RuntimeIdentifier)/native</_XamarinNativeLibraryDirectory>
<_XamarinIncludeDirectory>$(_XamarinSdkRuntimePackDirectory)/runtimes/$(RuntimeIdentifier)/native</_XamarinIncludeDirectory>
<_XamarinRefAssemblyDirectory>$(_XamarinRefPackageDirectory)/ref/net5.0/</_XamarinRefAssemblyDirectory>
<_XamarinRefAssemblyDirectory>$(_XamarinRefPackageDirectory)/ref/net6.0/</_XamarinRefAssemblyDirectory>
<_XamarinRefAssemblyPath>$(_XamarinRefAssemblyDirectory)$(_PlatformAssemblyName).dll</_XamarinRefAssemblyPath>
<_LibPartialStaticRegistrar>$(_XamarinNativeLibraryDirectory)/Microsoft.$(_PlatformName).registrar.a</_LibPartialStaticRegistrar>

2
external/Touch.Unit поставляемый

@ -1 +1 @@
Subproject commit 9abe69e6f5f13b24dd2603978636ee7c995a4151
Subproject commit f8768d99efe162f6e5158ca69751684f2c598fd1

78
src/Makefile
Просмотреть файл

@ -193,7 +193,7 @@ $(IOS_DOTNET_BUILD_DIR)/ios.rsp: Makefile Makefile.generator frameworks.sources
-sourceonly=$(IOS_DOTNET_BUILD_DIR)/ios-generated-sources \
-tmpdir=$(IOS_DOTNET_BUILD_DIR)/generated-sources \
-baselib=$(IOS_DOTNET_BUILD_DIR)/core-ios.dll \
--target-framework=.NETCoreApp,Version=5.0,Profile=ios \
--target-framework=.NETCoreApp,Version=6.0,Profile=ios \
$(IOS_APIS) \
> $@
@ -317,9 +317,9 @@ DOTNET_TARGETS += \
$(IOS_DOTNET_BUILD_DIR)/32/Xamarin.iOS.dll \
$(IOS_DOTNET_BUILD_DIR)/64/Xamarin.iOS.dll \
$(IOS_DOTNET_BUILD_DIR)/ref/Xamarin.iOS.dll \
$(DOTNET_DESTDIR)/$(IOS_NUGET).Ref/ref/net5.0/Xamarin.iOS.dll \
$(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0/Xamarin.iOS.dll) \
$(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0/Xamarin.iOS.pdb) \
$(DOTNET_DESTDIR)/$(IOS_NUGET).Ref/ref/net6.0/Xamarin.iOS.dll \
$(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.iOS.dll) \
$(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.iOS.pdb) \
DOTNET_TARGETS_DIRS += \
$(IOS_DOTNET_BUILD_DIR) \
@ -327,8 +327,8 @@ DOTNET_TARGETS_DIRS += \
$(IOS_DOTNET_BUILD_DIR)/64 \
$(IOS_DOTNET_BUILD_DIR)/ref \
$(IOS_DOTNET_BUILD_DIR)/generated-sources \
$(DOTNET_DESTDIR)/$(IOS_NUGET).Ref/ref/net5.0 \
$(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0) \
$(DOTNET_DESTDIR)/$(IOS_NUGET).Ref/ref/net6.0 \
$(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0) \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/%.dll: $(IOS_BUILD_DIR)/compat/%.dll | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1 $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/2.1/Facades
$(Q) install -m 0755 $< $@
@ -355,7 +355,7 @@ $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/%.pdb: $(IOS_BUILD_DIR)/r
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS/%.config: $(IOS_BUILD_DIR)/reference/%.config | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.iOS
$(Q) install -m 0644 $< $@
$(DOTNET_DESTDIR)/$(IOS_NUGET).Ref/ref/net5.0/Xamarin.iOS.dll: $(IOS_DOTNET_BUILD_DIR)/ref/Xamarin.iOS.dll | $(DOTNET_DESTDIR)/$(IOS_NUGET).Ref/ref/net5.0
$(DOTNET_DESTDIR)/$(IOS_NUGET).Ref/ref/net6.0/Xamarin.iOS.dll: $(IOS_DOTNET_BUILD_DIR)/ref/Xamarin.iOS.dll | $(DOTNET_DESTDIR)/$(IOS_NUGET).Ref/ref/net6.0
$(Q) $(CP) $< $@
# the actual architecture-specific versions
@ -371,16 +371,16 @@ $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/Xamarin.iOS.dll: $(IOS_BUILD_DIR)/n
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/Xamarin.iOS.pdb: $(IOS_BUILD_DIR)/native-64/Xamarin.iOS.pdb | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits
$(Q) install -m 0644 $< $@
$(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_32),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0/Xamarin.iOS.dll): $(IOS_DOTNET_BUILD_DIR)/32/Xamarin.iOS.dll | $(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_32),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0)
$(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_32),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.iOS.dll): $(IOS_DOTNET_BUILD_DIR)/32/Xamarin.iOS.dll | $(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_32),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
$(Q) $(CP) $< $@
$(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_32),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0/Xamarin.iOS.pdb): $(IOS_DOTNET_BUILD_DIR)/32/Xamarin.iOS.pdb | $(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_32),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0)
$(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_32),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.iOS.pdb): $(IOS_DOTNET_BUILD_DIR)/32/Xamarin.iOS.pdb | $(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_32),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
$(Q) $(CP) $< $@
$(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_64),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0/Xamarin.iOS.dll): $(IOS_DOTNET_BUILD_DIR)/64/Xamarin.iOS.dll | $(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_64),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0)
$(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_64),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.iOS.dll): $(IOS_DOTNET_BUILD_DIR)/64/Xamarin.iOS.dll | $(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_64),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
$(Q) $(CP) $< $@
$(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_64),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0/Xamarin.iOS.pdb): $(IOS_DOTNET_BUILD_DIR)/64/Xamarin.iOS.pdb | $(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_64),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0)
$(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_64),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.iOS.pdb): $(IOS_DOTNET_BUILD_DIR)/64/Xamarin.iOS.pdb | $(foreach rid,$(DOTNET_IOS_RUNTIME_IDENTIFIERS_64),$(DOTNET_DESTDIR)/$(IOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
$(Q) $(CP) $< $@
$(IOS_TARGETS_DIRS):
@ -546,7 +546,7 @@ $(MAC_BUILD_DIR)/%-reference/Xamarin.Mac.pdb: $(MAC_BUILD_DIR)/%-64/Xamarin.Mac.
@mkdir -p $(@D)
$(Q) $(CP) $^ $@
$(DOTNET_DESTDIR)/$(MACOS_NUGET).Ref/ref/net5.0/Xamarin.Mac.dll: $(MACOS_DOTNET_BUILD_DIR)/ref/Xamarin.Mac.dll | $(DOTNET_DESTDIR)/$(MACOS_NUGET).Ref/ref/net5.0
$(DOTNET_DESTDIR)/$(MACOS_NUGET).Ref/ref/net6.0/Xamarin.Mac.dll: $(MACOS_DOTNET_BUILD_DIR)/ref/Xamarin.Mac.dll | $(DOTNET_DESTDIR)/$(MACOS_NUGET).Ref/ref/net6.0
$(Q) $(CP) $< $@
### .NET ###
@ -570,7 +570,7 @@ $(MACOS_DOTNET_BUILD_DIR)/macos.rsp: Makefile Makefile.generator frameworks.sour
-sourceonly:$(MACOS_DOTNET_BUILD_DIR)/macos-generated-sources \
-tmpdir:$(MACOS_DOTNET_BUILD_DIR)/generated-sources \
-baselib:$(MACOS_DOTNET_BUILD_DIR)/core-macos.dll \
--target-framework=.NETCoreApp,Version=5.0,Profile=macos \
--target-framework=.NETCoreApp,Version=6.0,Profile=macos \
$(MAC_APIS) \
> $@
@ -590,17 +590,17 @@ $(MACOS_DOTNET_BUILD_DIR)/64/Xamarin.Mac%dll $(MACOS_DOTNET_BUILD_DIR)/64/Xamari
DOTNET_TARGETS += \
$(MACOS_DOTNET_BUILD_DIR)/64/Xamarin.Mac.dll \
$(MACOS_DOTNET_BUILD_DIR)/ref/Xamarin.Mac.dll \
$(DOTNET_DESTDIR)/$(MACOS_NUGET).Ref/ref/net5.0/Xamarin.Mac.dll \
$(foreach rid,$(DOTNET_MACOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0/Xamarin.Mac.dll) \
$(foreach rid,$(DOTNET_MACOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0/Xamarin.Mac.pdb) \
$(DOTNET_DESTDIR)/$(MACOS_NUGET).Ref/ref/net6.0/Xamarin.Mac.dll \
$(foreach rid,$(DOTNET_MACOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.Mac.dll) \
$(foreach rid,$(DOTNET_MACOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.Mac.pdb) \
DOTNET_TARGETS_DIRS += \
$(MACOS_DOTNET_BUILD_DIR) \
$(MACOS_DOTNET_BUILD_DIR)/generated-sources \
$(MACOS_DOTNET_BUILD_DIR)/64 \
$(MACOS_DOTNET_BUILD_DIR)/ref \
$(DOTNET_DESTDIR)/$(MACOS_NUGET).Ref/ref/net5.0 \
$(foreach rid,$(DOTNET_MACOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0) \
$(DOTNET_DESTDIR)/$(MACOS_NUGET).Ref/ref/net6.0 \
$(foreach rid,$(DOTNET_MACOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0) \
MAC_VARIANTS_TARGETS = \
$(MAC_BUILD_DIR)/mobile-64/Xamarin.Mac.dll \
@ -680,10 +680,10 @@ $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/Xamarin.Mac/Xamarin.Mac.dll
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/Xamarin.Mac.dll $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/Xamarin.Mac.pdb: | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5
$(Q) ln -sF ../../reference/full/$(@F) $@
$(foreach rid,$(DOTNET_MACOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0/Xamarin.Mac.dll): $(MACOS_DOTNET_BUILD_DIR)/64/Xamarin.Mac.dll | $(foreach rid,$(DOTNET_MACOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0)
$(foreach rid,$(DOTNET_MACOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.Mac.dll): $(MACOS_DOTNET_BUILD_DIR)/64/Xamarin.Mac.dll | $(foreach rid,$(DOTNET_MACOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
$(Q) $(CP) $< $@
$(foreach rid,$(DOTNET_MACOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0/Xamarin.Mac.pdb): $(MACOS_DOTNET_BUILD_DIR)/64/Xamarin.Mac.pdb | $(foreach rid,$(DOTNET_MACOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0)
$(foreach rid,$(DOTNET_MACOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.Mac.pdb): $(MACOS_DOTNET_BUILD_DIR)/64/Xamarin.Mac.pdb | $(foreach rid,$(DOTNET_MACOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(MACOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
$(Q) $(CP) $< $@
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/pkgconfig/xammac.pc: $(TOP)/Make.config | $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/pkgconfig
@ -804,7 +804,7 @@ $(WATCHOS_DOTNET_BUILD_DIR)/watchos.rsp: Makefile Makefile.generator frameworks.
-sourceonly=$(WATCHOS_DOTNET_BUILD_DIR)/watchos-generated-sources \
-tmpdir=$(WATCHOS_DOTNET_BUILD_DIR)/generated-sources \
-baselib=$(WATCHOS_DOTNET_BUILD_DIR)/core-watchos.dll \
--target-framework=.NETCoreApp,Version=5.0,Profile=watchos \
--target-framework=.NETCoreApp,Version=6.0,Profile=watchos \
$(WATCHOS_APIS) \
> $@
@ -880,17 +880,17 @@ WATCH_TARGETS += \
DOTNET_TARGETS += \
$(WATCHOS_DOTNET_BUILD_DIR)/32/Xamarin.WatchOS.dll \
$(WATCHOS_DOTNET_BUILD_DIR)/ref/Xamarin.WatchOS.dll \
$(DOTNET_DESTDIR)/$(WATCHOS_NUGET).Ref/ref/net5.0/Xamarin.WatchOS.dll \
$(foreach rid,$(DOTNET_WATCHOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(WATCHOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0/Xamarin.WatchOS.dll) \
$(foreach rid,$(DOTNET_WATCHOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(WATCHOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0/Xamarin.WatchOS.pdb) \
$(DOTNET_DESTDIR)/$(WATCHOS_NUGET).Ref/ref/net6.0/Xamarin.WatchOS.dll \
$(foreach rid,$(DOTNET_WATCHOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(WATCHOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.WatchOS.dll) \
$(foreach rid,$(DOTNET_WATCHOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(WATCHOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.WatchOS.pdb) \
DOTNET_TARGETS_DIRS += \
$(WATCHOS_DOTNET_BUILD_DIR) \
$(WATCHOS_DOTNET_BUILD_DIR)/generated-sources \
$(WATCHOS_DOTNET_BUILD_DIR)/32 \
$(WATCHOS_DOTNET_BUILD_DIR)/ref \
$(DOTNET_DESTDIR)/$(WATCHOS_NUGET).Ref/ref/net5.0 \
$(foreach rid,$(DOTNET_WATCHOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(WATCHOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0) \
$(DOTNET_DESTDIR)/$(WATCHOS_NUGET).Ref/ref/net6.0 \
$(foreach rid,$(DOTNET_WATCHOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(WATCHOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0) \
# reference assemblies, this is just for compilation with XS
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.WatchOS/%.dll: $(WATCH_BUILD_DIR)/reference/%.dll | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.WatchOS $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.WatchOS/Facades
@ -902,7 +902,7 @@ $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.WatchOS/%.pdb: $(WATCH_BUILD_
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.WatchOS/%.config: $(WATCH_BUILD_DIR)/reference/%.config | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.WatchOS
$(Q) install -m 0644 $< $@
$(DOTNET_DESTDIR)/$(WATCHOS_NUGET).Ref/ref/net5.0/Xamarin.WatchOS.dll: $(WATCHOS_DOTNET_BUILD_DIR)/ref/Xamarin.WatchOS.dll | $(DOTNET_DESTDIR)/$(WATCHOS_NUGET).Ref/ref/net5.0
$(DOTNET_DESTDIR)/$(WATCHOS_NUGET).Ref/ref/net6.0/Xamarin.WatchOS.dll: $(WATCHOS_DOTNET_BUILD_DIR)/ref/Xamarin.WatchOS.dll | $(DOTNET_DESTDIR)/$(WATCHOS_NUGET).Ref/ref/net6.0
$(Q) $(CP) $< $@
# the actual architecture-specific versions
@ -912,10 +912,10 @@ $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/32bits/Xamarin.WatchOS.dll: $(WATCH_BUILD_
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/32bits/Xamarin.WatchOS.pdb: $(WATCH_BUILD_DIR)/watch-32/Xamarin.WatchOS.pdb | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/32bits
$(Q) install -m 0644 $< $@
$(foreach rid,$(DOTNET_WATCHOS_RUNTIME_IDENTIFIERS_32),$(DOTNET_DESTDIR)/$(WATCHOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0/Xamarin.WatchOS.dll): $(WATCHOS_DOTNET_BUILD_DIR)/32/Xamarin.WatchOS.dll | $(foreach rid,$(DOTNET_WATCHOS_RUNTIME_IDENTIFIERS_32),$(DOTNET_DESTDIR)/$(WATCHOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0)
$(foreach rid,$(DOTNET_WATCHOS_RUNTIME_IDENTIFIERS_32),$(DOTNET_DESTDIR)/$(WATCHOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.WatchOS.dll): $(WATCHOS_DOTNET_BUILD_DIR)/32/Xamarin.WatchOS.dll | $(foreach rid,$(DOTNET_WATCHOS_RUNTIME_IDENTIFIERS_32),$(DOTNET_DESTDIR)/$(WATCHOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
$(Q) $(CP) $< $@
$(foreach rid,$(DOTNET_WATCHOS_RUNTIME_IDENTIFIERS_32),$(DOTNET_DESTDIR)/$(WATCHOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0/Xamarin.WatchOS.pdb): $(WATCHOS_DOTNET_BUILD_DIR)/32/Xamarin.WatchOS.pdb | $(foreach rid,$(DOTNET_WATCHOS_RUNTIME_IDENTIFIERS_32),$(DOTNET_DESTDIR)/$(WATCHOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0)
$(foreach rid,$(DOTNET_WATCHOS_RUNTIME_IDENTIFIERS_32),$(DOTNET_DESTDIR)/$(WATCHOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.WatchOS.pdb): $(WATCHOS_DOTNET_BUILD_DIR)/32/Xamarin.WatchOS.pdb | $(foreach rid,$(DOTNET_WATCHOS_RUNTIME_IDENTIFIERS_32),$(DOTNET_DESTDIR)/$(WATCHOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
$(Q) $(CP) $< $@
$(WATCH_TARGETS_DIRS):
@ -1036,7 +1036,7 @@ $(TVOS_DOTNET_BUILD_DIR)/tvos.rsp: Makefile Makefile.generator frameworks.source
-sourceonly=$(TVOS_DOTNET_BUILD_DIR)/tvos-generated-sources \
-tmpdir=$(TVOS_DOTNET_BUILD_DIR)/generated-sources \
-baselib=$(TVOS_DOTNET_BUILD_DIR)/core-tvos.dll \
--target-framework=.NETCoreApp,Version=5.0,Profile=tvos \
--target-framework=.NETCoreApp,Version=6.0,Profile=tvos \
$(TVOS_APIS) \
> $@
@ -1126,17 +1126,17 @@ TVOS_TARGETS += \
DOTNET_TARGETS += \
$(TVOS_DOTNET_BUILD_DIR)/64/Xamarin.TVOS.dll \
$(TVOS_DOTNET_BUILD_DIR)/ref/Xamarin.TVOS.dll \
$(DOTNET_DESTDIR)/$(TVOS_NUGET).Ref/ref/net5.0/Xamarin.TVOS.dll \
$(foreach rid,$(DOTNET_TVOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(TVOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0/Xamarin.TVOS.dll) \
$(foreach rid,$(DOTNET_TVOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(TVOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0/Xamarin.TVOS.pdb) \
$(DOTNET_DESTDIR)/$(TVOS_NUGET).Ref/ref/net6.0/Xamarin.TVOS.dll \
$(foreach rid,$(DOTNET_TVOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(TVOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.TVOS.dll) \
$(foreach rid,$(DOTNET_TVOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(TVOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.TVOS.pdb) \
DOTNET_TARGETS_DIRS += \
$(TVOS_DOTNET_BUILD_DIR) \
$(TVOS_DOTNET_BUILD_DIR)/generated-sources \
$(TVOS_DOTNET_BUILD_DIR)/64 \
$(TVOS_DOTNET_BUILD_DIR)/ref \
$(DOTNET_DESTDIR)/$(TVOS_NUGET).Ref/ref/net5.0 \
$(foreach rid,$(DOTNET_TVOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(TVOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0) \
$(DOTNET_DESTDIR)/$(TVOS_NUGET).Ref/ref/net6.0 \
$(foreach rid,$(DOTNET_TVOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(TVOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0) \
# reference assemblies, this is just for compilation with XS
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/%.dll: $(TVOS_BUILD_DIR)/reference/%.dll | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/Facades
@ -1148,7 +1148,7 @@ $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/%.pdb: $(TVOS_BUILD_DIR)
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS/%.config: $(TVOS_BUILD_DIR)/reference/%.config | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/mono/Xamarin.TVOS
$(Q) install -m 0644 $< $@
$(DOTNET_DESTDIR)/$(TVOS_NUGET).Ref/ref/net5.0/Xamarin.TVOS.dll: $(TVOS_DOTNET_BUILD_DIR)/ref/Xamarin.TVOS.dll | $(DOTNET_DESTDIR)/$(TVOS_NUGET).Ref/ref/net5.0
$(DOTNET_DESTDIR)/$(TVOS_NUGET).Ref/ref/net6.0/Xamarin.TVOS.dll: $(TVOS_DOTNET_BUILD_DIR)/ref/Xamarin.TVOS.dll | $(DOTNET_DESTDIR)/$(TVOS_NUGET).Ref/ref/net6.0
$(Q) $(CP) $< $@
# the actual architecture-specific versions
@ -1158,10 +1158,10 @@ $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/Xamarin.TVOS.dll: $(TVOS_BUILD_DIR)
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/Xamarin.TVOS.pdb: $(TVOS_BUILD_DIR)/tvos-64/Xamarin.TVOS.pdb | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits
$(Q) install -m 0644 $< $@
$(foreach rid,$(DOTNET_TVOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(TVOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0/Xamarin.TVOS.dll): $(TVOS_DOTNET_BUILD_DIR)/64/Xamarin.TVOS.dll | $(foreach rid,$(DOTNET_TVOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(TVOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0)
$(foreach rid,$(DOTNET_TVOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(TVOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.TVOS.dll): $(TVOS_DOTNET_BUILD_DIR)/64/Xamarin.TVOS.dll | $(foreach rid,$(DOTNET_TVOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(TVOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
$(Q) $(CP) $< $@
$(foreach rid,$(DOTNET_TVOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(TVOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0/Xamarin.TVOS.pdb): $(TVOS_DOTNET_BUILD_DIR)/64/Xamarin.TVOS.pdb | $(foreach rid,$(DOTNET_TVOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(TVOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net5.0)
$(foreach rid,$(DOTNET_TVOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(TVOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0/Xamarin.TVOS.pdb): $(TVOS_DOTNET_BUILD_DIR)/64/Xamarin.TVOS.pdb | $(foreach rid,$(DOTNET_TVOS_RUNTIME_IDENTIFIERS),$(DOTNET_DESTDIR)/$(TVOS_NUGET).Runtime.$(rid)/runtimes/$(rid)/lib/net6.0)
$(Q) $(CP) $< $@
$(TVOS_TARGETS_DIRS):
@ -1195,7 +1195,7 @@ $(DOTNET_COMPILER): Makefile $(TOP)/Make.config | $(DOTNET_BUILD_DIR)
$(Q) chmod +x $@
# This tells NuGet to use the exact same dotnet version we've configured in Make.config
global.json: $(TOP)/global5.json
global.json: $(TOP)/global6.json
$(Q) $(CP) $< $@
install-local:: $(INSTALL_TARGETS)

4
src/Makefile.generator
Просмотреть файл

@ -14,9 +14,9 @@ $(BUILD_DIR)/common/bgen.exe: $(generator_dependencies) Makefile.generator $(BUI
$(Q_GEN) $(SYSTEM_MSBUILD) $(XBUILD_VERBOSITY) /p:Configuration=Debug generator.csproj /p:IntermediateOutputPath=$(BUILD_DIR)/IDE/obj/common/ /p:OutputPath=$(BUILD_DIR)/common
$(DOTNET_BUILD_DIR)/bgen/bgen: $(generator_dependencies) Makefile.generator $(BUILD_DIR)/generator-frameworks.g.cs global.json | $(DOTNET_BUILD_DIR)/bgen
$(Q_DOTNET_BUILD) $(DOTNET5) publish $(XBUILD_VERBOSITY) /p:Configuration=Debug bgen/bgen.csproj /p:IntermediateOutputPath=$(abspath $(DOTNET_BUILD_DIR)/IDE/obj/common)/ /p:OutputPath=$(abspath $(DOTNET_BUILD_DIR)/IDE/bin/common)/
$(Q_DOTNET_BUILD) $(DOTNET6) publish $(XBUILD_VERBOSITY) /p:Configuration=Debug bgen/bgen.csproj /p:IntermediateOutputPath=$(abspath $(DOTNET_BUILD_DIR)/IDE/obj/common)/ /p:OutputPath=$(abspath $(DOTNET_BUILD_DIR)/IDE/bin/common)/
$(Q) $(CP) $(DOTNET_BUILD_DIR)/IDE/bin/common/bgen* $(dir $@)
$(Q) printf 'exec $(DOTNET5) "$$(dirname "$$0")"/bgen.dll $$@\n' > $@
$(Q) printf 'exec $(DOTNET6) "$$(dirname "$$0")"/bgen.dll $$@\n' > $@
$(Q) chmod +x $@

2
tests/BundledResources/dotnet/iOS/BundledResources.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<LangVersion>latest</LangVersion>
</PropertyGroup>

2
tests/BundledResources/dotnet/macOS/BundledResources.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-macos</TargetFramework>
<TargetFramework>net6.0-macos</TargetFramework>
<LangVersion>latest</LangVersion>
</PropertyGroup>

2
tests/BundledResources/dotnet/tvOS/BundledResources.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-tvos</TargetFramework>
<TargetFramework>net6.0-tvos</TargetFramework>
<LangVersion>latest</LangVersion>
</PropertyGroup>

2
tests/BundledResources/dotnet/watchOS/BundledResources.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-watchos</TargetFramework>
<TargetFramework>net6.0-watchos</TargetFramework>
<LangVersion>latest</LangVersion>
</PropertyGroup>

2
tests/EmbeddedResources/dotnet/iOS/EmbeddedResources.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
</PropertyGroup>
<Import Project="..\shared.targets" />
</Project>

2
tests/EmbeddedResources/dotnet/macOS/EmbeddedResources.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-macos</TargetFramework>
<TargetFramework>net6.0-macos</TargetFramework>
</PropertyGroup>
<Import Project="..\shared.targets" />
</Project>

2
tests/EmbeddedResources/dotnet/tvOS/EmbeddedResources.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-tvos</TargetFramework>
<TargetFramework>net6.0-tvos</TargetFramework>
</PropertyGroup>
<Import Project="..\shared.targets" />
</Project>

2
tests/EmbeddedResources/dotnet/watchOS/EmbeddedResources.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-watchos</TargetFramework>
<TargetFramework>net6.0-watchos</TargetFramework>
</PropertyGroup>
<Import Project="..\shared.targets" />
</Project>

4
tests/Makefile
Просмотреть файл

@ -98,7 +98,7 @@ test.config: Makefile $(TOP)/Make.config $(TOP)/mk/mono.mk
@echo "MONO_MAC_SDK_DESTDIR=$(MONO_MAC_SDK_DESTDIR)" >> $@
@echo "ENABLE_XAMARIN=$(ENABLE_XAMARIN)" >> $@
@echo "DOTNET=$(DOTNET)" >> $@
@echo "DOTNET5=$(DOTNET5)" >> $@
@echo "DOTNET6=$(DOTNET6)" >> $@
@echo "IOS_SDK_VERSION=$(IOS_SDK_VERSION)" >> $@
@echo "TVOS_SDK_VERSION=$(TVOS_SDK_VERSION)" >> $@
@echo "WATCH_SDK_VERSION=$(WATCH_SDK_VERSION)" >> $@
@ -115,7 +115,7 @@ test-system.config: Makefile $(TOP)/Make.config $(TOP)/mk/mono.mk
@echo "MONO_IOS_SDK_DESTDIR=$(MONO_IOS_SDK_DESTDIR)" >> $@
@echo "MONO_MAC_SDK_DESTDIR=$(MONO_MAC_SDK_DESTDIR)" >> $@
@echo "DOTNET=$(DOTNET)" >> $@
@echo "DOTNET5=$(DOTNET5)" >> $@
@echo "DOTNET6=$(DOTNET6)" >> $@
@echo "IOS_SDK_VERSION=$(IOS_SDK_VERSION)" >> $@
@echo "TVOS_SDK_VERSION=$(TVOS_SDK_VERSION)" >> $@
@echo "WATCH_SDK_VERSION=$(WATCH_SDK_VERSION)" >> $@

2
tests/bgen/bgen-tests.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>bgen_tests</RootNamespace>
<IsPackable>false</IsPackable>

2
tests/bindings-test/dotnet/iOS/bindings-test.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<NativeLibName>ios-fat</NativeLibName>
</PropertyGroup>
<Import Project="..\shared.targets" />

2
tests/bindings-test/dotnet/macOS/bindings-test.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-macos</TargetFramework>
<TargetFramework>net6.0-macos</TargetFramework>
<NativeLibName>macos</NativeLibName>
</PropertyGroup>
<Import Project="..\shared.targets" />

2
tests/bindings-test/dotnet/tvOS/bindings-test.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-tvos</TargetFramework>
<TargetFramework>net6.0-tvos</TargetFramework>
<NativeLibName>tvos-fat</NativeLibName>
</PropertyGroup>
<Import Project="..\shared.targets" />

2
tests/bindings-test/dotnet/watchOS/bindings-test.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-watchos</TargetFramework>
<TargetFramework>net6.0-watchos</TargetFramework>
<NativeLibName>watchos-fat</NativeLibName>
</PropertyGroup>
<Import Project="..\shared.targets" />

2
tests/bindings-test2/dotnet/iOS/bindings-test2.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<NativeLibName>ios-fat</NativeLibName>
<PlatformName>iOS</PlatformName>
<RootTestsDirectory>..\..\..</RootTestsDirectory>

2
tests/bindings-test2/dotnet/macOS/bindings-test2.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-macos</TargetFramework>
<TargetFramework>net6.0-macos</TargetFramework>
<NativeLibName>macos</NativeLibName>
<PlatformName>macOS</PlatformName>
<RootTestsDirectory>..\..\..</RootTestsDirectory>

2
tests/bindings-test2/dotnet/tvOS/bindings-test2.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-tvos</TargetFramework>
<TargetFramework>net6.0-tvos</TargetFramework>
<NativeLibName>tvos-fat</NativeLibName>
<PlatformName>tvOS</PlatformName>
<RootTestsDirectory>..\..\..</RootTestsDirectory>

2
tests/bindings-test2/dotnet/watchOS/bindings-test2.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-watchos</TargetFramework>
<TargetFramework>net6.0-watchos</TargetFramework>
<NativeLibName>watchos-fat</NativeLibName>
<PlatformName>watchOS</PlatformName>
<RootTestsDirectory>..\..\..</RootTestsDirectory>

2
tests/common/Configuration.cs
Просмотреть файл

@ -428,7 +428,7 @@ namespace Xamarin.Tests
public static string GetRefDirectory (TargetFramework targetFramework)
{
if (targetFramework.IsDotNet)
return Path.Combine (GetDotNetRoot (), GetRefNuGetName (targetFramework), "ref", "net5.0");
return Path.Combine (GetDotNetRoot (), GetRefNuGetName (targetFramework), "ref", "net6.0");
// This is only applicable for .NET
throw new InvalidOperationException (targetFramework.ToString ());

2
tests/common/DotNet.cs
Просмотреть файл

@ -14,7 +14,7 @@ namespace Xamarin.Tests {
public static string Executable {
get {
if (dotnet_executable == null) {
dotnet_executable = Configuration.EvaluateVariable ("DOTNET5");
dotnet_executable = Configuration.EvaluateVariable ("DOTNET6");
if (string.IsNullOrEmpty (dotnet_executable))
throw new Exception ($"Could not find the dotnet executable.");
if (!File.Exists (dotnet_executable))

2
tests/common/TestProjects/AppWithExtraArgumentThatOverrides/AppWithExtraArgumentThatOverrides.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
<MtouchLink>None</MtouchLink>

2
tests/common/TestProjects/Bug60536/Bug60536.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
</PropertyGroup>

2
tests/common/TestProjects/My Spaced App/My Spaced App.dotnet.csproj
Просмотреть файл

@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../Common.props" />
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
<AssemblyName>MySpacedApp</AssemblyName>

2
tests/common/TestProjects/MyActionExtension/MyActionExtension.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<IsAppExtension>true</IsAppExtension>
</PropertyGroup>

2
tests/common/TestProjects/MyAppWithPackageReference/MyAppWithPackageReference.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
</PropertyGroup>

2
tests/common/TestProjects/MyCoreMLApp/MyCoreMLApp.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
</PropertyGroup>

2
tests/common/TestProjects/MyDocumentPickerExtension/MyDocumentPickerExtension.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<IsAppExtension>true</IsAppExtension>
</PropertyGroup>

2
tests/common/TestProjects/MyExtensionWithPackageReference/MyExtensionWithPackageReference.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<IsAppExtension>true</IsAppExtension>
</PropertyGroup>

2
tests/common/TestProjects/MyIBToolLinkTest/MyIBToolLinkTest.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<OutputType>Exe</OutputType>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
</PropertyGroup>

2
tests/common/TestProjects/MyKeyboardExtension/MyKeyboardExtension.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<IsAppExtension>true</IsAppExtension>
</PropertyGroup>

2
tests/common/TestProjects/MyLinkedAssets/MyLinkedAssets.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
</PropertyGroup>

2
tests/common/TestProjects/MyMasterDetailApp/MyMasterDetailApp.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
</PropertyGroup>

2
tests/common/TestProjects/MyMetalGame/MyMetalGame.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
</PropertyGroup>

2
tests/common/TestProjects/MyOpenGLApp/MyOpenGLApp.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
</PropertyGroup>

2
tests/common/TestProjects/MyPhotoEditingExtension/MyPhotoEditingExtension.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<IsAppExtension>true</IsAppExtension>
</PropertyGroup>

2
tests/common/TestProjects/MyReleaseBuild/MyReleaseBuild.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
</PropertyGroup>

2
tests/common/TestProjects/MySceneKitApp/MySceneKitApp.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
</PropertyGroup>

2
tests/common/TestProjects/MyShareExtension/MyShareExtension.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<IsAppExtension>true</IsAppExtension>
</PropertyGroup>

2
tests/common/TestProjects/MySingleView/MyLibrary/MyLibrary.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<OutputType>Library</OutputType>
</PropertyGroup>

2
tests/common/TestProjects/MySingleView/MySingleView.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<OutputType>Exe</OutputType>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<DefaultItemExcludes>$(DefaultItemExcludes);MyLibrary\**</DefaultItemExcludes>

2
tests/common/TestProjects/MySpriteKitGame/MySpriteKitGame.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
</PropertyGroup>

2
tests/common/TestProjects/MyTVApp/MyTVApp.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-tvos</TargetFramework>
<TargetFramework>net6.0-tvos</TargetFramework>
<RuntimeIdentifier>tvos-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
</PropertyGroup>

2
tests/common/TestProjects/MyTVMetalGame/MyTVMetalGame.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-tvos</TargetFramework>
<TargetFramework>net6.0-tvos</TargetFramework>
<OutputType>Exe</OutputType>
<RuntimeIdentifier>tvos-x64</RuntimeIdentifier>
</PropertyGroup>

2
tests/common/TestProjects/MyTVServicesExtension/MyTVServicesExtension.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-tvos</TargetFramework>
<TargetFramework>net6.0-tvos</TargetFramework>
<RuntimeIdentifier>tvos-x64</RuntimeIdentifier>
<IsAppExtension>true</IsAppExtension>
</PropertyGroup>

2
tests/common/TestProjects/MyTabbedApplication/MyTabbedApplication.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
</PropertyGroup>

2
tests/common/TestProjects/MyTodayExtension/MyTodayExtension.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<IsAppExtension>true</IsAppExtension>
</PropertyGroup>

2
tests/common/TestProjects/MyWatch2Container/MyWatch2Container.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
</PropertyGroup>

2
tests/common/TestProjects/MyWatchApp2/MyWatchApp2.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-watchos</TargetFramework>
<TargetFramework>net6.0-watchos</TargetFramework>
<RuntimeIdentifier>watchos-x86</RuntimeIdentifier>
<IsWatchOSApp>true</IsWatchOSApp>
</PropertyGroup>

2
tests/common/TestProjects/MyWatchKit2Extension/MyWatchKit2Extension.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-watchos</TargetFramework>
<TargetFramework>net6.0-watchos</TargetFramework>
<RuntimeIdentifier>watchos-x86</RuntimeIdentifier>
<IsAppExtension>true</IsAppExtension>
</PropertyGroup>

2
tests/common/TestProjects/MyWatchKit2IntentsExtension/MyWatchKit2IntentsExtension.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-watchos</TargetFramework>
<TargetFramework>net6.0-watchos</TargetFramework>
<RuntimeIdentifier>watchos-x86</RuntimeIdentifier>
<IsAppExtension>true</IsAppExtension>
</PropertyGroup>

2
tests/common/TestProjects/MyWebViewApp/MyWebViewApp.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
</PropertyGroup>

2
tests/common/TestProjects/MyXamarinFormsApp/MyXamarinFormsApp.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

2
tests/common/TestProjects/MyiOSAppWithBinding/MyiOSAppWithBinding.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
</PropertyGroup>

2
tests/common/TestProjects/MyiOSFrameworkBinding/MyiOSFrameworkBinding.dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<IsBindingProject>true</IsBindingProject>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

2
tests/dotnet/Makefile
Просмотреть файл

@ -12,7 +12,7 @@ NuGet.config: $(TOP)/NuGet.config Makefile
$(Q) mv $@.tmp $@
# This tells NuGet to use the exact same dotnet version we've configured in Make.config
global.json: $(TOP)/global5.json
global.json: $(TOP)/global6.json
$(CP) $< $@
../bgen/global.json: global.json

2
tests/dotnet/MyClassLibrary/MyClassLibrary.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
</PropertyGroup>
</Project>

2
tests/dotnet/MyClassLibrary/iOS/MyClassLibrary.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
</PropertyGroup>
</Project>

2
tests/dotnet/MyClassLibrary/macOS/MyClassLibrary.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-macos</TargetFramework>
<TargetFramework>net6.0-macos</TargetFramework>
</PropertyGroup>
</Project>

2
tests/dotnet/MyClassLibrary/tvOS/MyClassLibrary.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-tvos</TargetFramework>
<TargetFramework>net6.0-tvos</TargetFramework>
</PropertyGroup>
</Project>

2
tests/dotnet/MyClassLibrary/watchOS/MyClassLibrary.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-watchos</TargetFramework>
<TargetFramework>net6.0-watchos</TargetFramework>
</PropertyGroup>
</Project>

2
tests/dotnet/MyCocoaApp/MyCocoaApp.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-macos</TargetFramework>
<TargetFramework>net6.0-macos</TargetFramework>
<RuntimeIdentifier>osx-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
</PropertyGroup>

2
tests/dotnet/MySingleView/MySingleView.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
</PropertyGroup>

2
tests/dotnet/MyTVApp/MyTVApp.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-tvos</TargetFramework>
<TargetFramework>net6.0-tvos</TargetFramework>
<RuntimeIdentifier>tvos-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
</PropertyGroup>

2
tests/dotnet/MyWatchApp/MyWatchApp/MyWatchApp.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-watchos</TargetFramework>
<TargetFramework>net6.0-watchos</TargetFramework>
<RuntimeIdentifier>watchos-x86</RuntimeIdentifier>
<IsWatchOSApp>true</IsWatchOSApp>
</PropertyGroup>

2
tests/dotnet/MyWatchApp/MyWatchContainer/MyWatchContainer.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
</PropertyGroup>

2
tests/dotnet/MyWatchApp/MyWatchExtension/MyWatchExtension.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-watchos</TargetFramework>
<TargetFramework>net6.0-watchos</TargetFramework>
<RuntimeIdentifier>watchos-x86</RuntimeIdentifier>
<IsAppExtension>true</IsAppExtension>
</PropertyGroup>

8
tests/dotnet/UnitTests/ProjectTest.cs
Просмотреть файл

@ -55,7 +55,7 @@ namespace Xamarin.Tests {
Clean (project_path);
var result = DotNet.AssertBuild (project_path, verbosity);
AssertThatLinkerExecuted (result);
AssertAppContents (platform, Path.Combine (Path.GetDirectoryName (project_path), "bin", "Debug", "net5.0-ios", "ios-x64", "MySingleView.app"));
AssertAppContents (platform, Path.Combine (Path.GetDirectoryName (project_path), "bin", "Debug", "net6.0-ios", "ios-x64", "MySingleView.app"));
}
[Test]
@ -67,7 +67,7 @@ namespace Xamarin.Tests {
Clean (project_path);
var result = DotNet.AssertBuild (project_path, verbosity);
AssertThatLinkerExecuted (result);
AssertAppContents (platform, Path.Combine (Path.GetDirectoryName (project_path), "bin", "Debug", "net5.0-macos", "osx-x64", "MyCocoaApp.app"));
AssertAppContents (platform, Path.Combine (Path.GetDirectoryName (project_path), "bin", "Debug", "net6.0-macos", "osx-x64", "MyCocoaApp.app"));
}
[Test]
@ -79,7 +79,7 @@ namespace Xamarin.Tests {
Clean (project_path);
var result = DotNet.AssertBuild (project_path, verbosity);
AssertThatLinkerExecuted (result);
AssertAppContents (platform, Path.Combine (Path.GetDirectoryName (project_path), "bin", "Debug", "net5.0-tvos", "tvos-x64", "MyTVApp.app"));
AssertAppContents (platform, Path.Combine (Path.GetDirectoryName (project_path), "bin", "Debug", "net6.0-tvos", "tvos-x64", "MyTVApp.app"));
}
[Test]
@ -337,7 +337,7 @@ namespace Xamarin.Tests {
properties ["IsMacEnabled"] = "false";
var result = DotNet.AssertBuild (project_path, properties);
AssertThatLinkerDidNotExecute (result);
var appPath = Path.Combine (Path.GetDirectoryName (project_path), "bin", "Debug", "net5.0-ios", runtimeIdentifier, "MySingleView.app");
var appPath = Path.Combine (Path.GetDirectoryName (project_path), "bin", "Debug", "net6.0-ios", runtimeIdentifier, "MySingleView.app");
var appExecutable = Path.Combine (appPath, Path.GetFileName (project_path));
Assert.That (appPath, Does.Exist, "There is an .app");
Assert.That (appExecutable, Does.Not.Empty, "There is no executable");

2
tests/fsharplibrary/dotnet/iOS/fsharplibrary.fsproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
</PropertyGroup>
<Import Project="..\shared.targets" />
</Project>

2
tests/fsharplibrary/dotnet/macOS/fsharplibrary.fsproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-macos</TargetFramework>
<TargetFramework>net6.0-macos</TargetFramework>
</PropertyGroup>
<Import Project="..\shared.targets" />
</Project>

2
tests/fsharplibrary/dotnet/tvOS/fsharplibrary.fsproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-tvos</TargetFramework>
<TargetFramework>net6.0-tvos</TargetFramework>
</PropertyGroup>
<Import Project="..\shared.targets" />
</Project>

2
tests/fsharplibrary/dotnet/watchOS/fsharplibrary.fsproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-watchos</TargetFramework>
<TargetFramework>net6.0-watchos</TargetFramework>
</PropertyGroup>
<Import Project="..\shared.targets" />
</Project>

8
tests/generator/BGenTool.cs
Просмотреть файл

@ -80,16 +80,16 @@ namespace Xamarin.Tests
case Profile.None:
break;
case Profile.iOS:
targetFramework = TargetFramework.DotNet_5_0_iOS_String;
targetFramework = TargetFramework.DotNet_6_0_iOS_String;
break;
case Profile.tvOS:
targetFramework = TargetFramework.DotNet_5_0_tvOS_String;
targetFramework = TargetFramework.DotNet_6_0_tvOS_String;
break;
case Profile.watchOS:
targetFramework = TargetFramework.DotNet_5_0_watchOS_String;
targetFramework = TargetFramework.DotNet_6_0_watchOS_String;
break;
case Profile.macOSMobile:
targetFramework = TargetFramework.DotNet_5_0_macOS_String;
targetFramework = TargetFramework.DotNet_6_0_macOS_String;
break;
case Profile.macOSFull:
case Profile.macOSSystem:

2
tests/interdependent-binding-projects/dotnet/iOS/interdependent-binding-projects.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<OutputType>Exe</OutputType>
<SignAssembly>true</SignAssembly>
<LangVersion>latest</LangVersion>

2
tests/interdependent-binding-projects/dotnet/macOS/interdependent-binding-projects.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-macos</TargetFramework>
<TargetFramework>net6.0-macos</TargetFramework>
<OutputType>Exe</OutputType>
<SignAssembly>true</SignAssembly>
<LangVersion>latest</LangVersion>

2
tests/interdependent-binding-projects/dotnet/tvOS/interdependent-binding-projects.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-tvos</TargetFramework>
<TargetFramework>net6.0-tvos</TargetFramework>
<OutputType>Exe</OutputType>
<SignAssembly>true</SignAssembly>
<LangVersion>latest</LangVersion>

2
tests/interdependent-binding-projects/dotnet/watchOS/interdependent-binding-projects.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-watchos</TargetFramework>
<TargetFramework>net6.0-watchos</TargetFramework>
<OutputType>Exe</OutputType>
<SignAssembly>true</SignAssembly>
<LangVersion>latest</LangVersion>

2
tests/introspection/iOS/introspection-ios-dotnet.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
<DefineConstants>NET</DefineConstants>

2
tests/linker/ios/dont link/dotnet/iOS/dont link.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
<DefineConstants>NET</DefineConstants>

2
tests/linker/ios/link all/dotnet/iOS/link all.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
<DefineConstants>NET</DefineConstants>

2
tests/linker/ios/link sdk/dotnet/iOS/link sdk.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
<DefineConstants>NET</DefineConstants>

2
tests/monotouch-test/dotnet/iOS/monotouch-test.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-ios</TargetFramework>
<TargetFramework>net6.0-ios</TargetFramework>
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
<OutputType>Exe</OutputType>
<DefineConstants>NET</DefineConstants>

2
tests/msbuild/Xamarin.MacDev.Tests/TestHelpers/TestBase.cs
Просмотреть файл

@ -172,7 +172,7 @@ namespace Xamarin.Tests
}
if (Mode == ExecutionMode.DotNet) {
var targetPlatform = "net5.0";
var targetPlatform = "net6.0";
var subdir = string.Empty;
var targetPlatformSuffix = string.Empty;
var isDevice = Platform == "iPhone";

8
tests/xharness/Harness.cs
Просмотреть файл

@ -129,7 +129,7 @@ namespace Xharness {
public string MONO_MAC_SDK_DESTDIR { get; }
public bool ENABLE_XAMARIN { get; }
public string DOTNET { get; }
public string DOTNET5 { get; }
public string DOTNET6 { get; }
// Run
@ -202,7 +202,7 @@ namespace Xharness {
MONO_MAC_SDK_DESTDIR = config ["MONO_MAC_SDK_DESTDIR"];
ENABLE_XAMARIN = config.ContainsKey ("ENABLE_XAMARIN") && !string.IsNullOrEmpty (config ["ENABLE_XAMARIN"]);
DOTNET = config ["DOTNET"];
DOTNET5 = config ["DOTNET5"];
DOTNET6 = config ["DOTNET6"];
if (string.IsNullOrEmpty (SdkRoot))
SdkRoot = config ["XCODE_DEVELOPER_ROOT"] ?? configuration.SdkRoot;
@ -736,7 +736,7 @@ namespace Xharness {
return rv;
}
// Gets either the DOTNET or DOTNET5 variable, depending on any global.json
// Gets either the DOTNET or DOTNET6 variable, depending on any global.json
// config file found in the specified directory or any containing directories.
Dictionary<string, string> dotnet_executables = new Dictionary<string, string> ();
public string GetDotNetExecutable (string directory)
@ -773,7 +773,7 @@ namespace Xharness {
executable = DOTNET;
break;
default:
executable = DOTNET5;
executable = DOTNET6;
break;
}
Log ($"Mapped .NET SDK version {version} to {executable} for {directory}");

2
tests/xharness/Targets/MacTarget.cs
Просмотреть файл

@ -110,7 +110,7 @@ namespace Xharness.Targets
public override string DotNetSdk => "Microsoft.macOS.Sdk";
public override string RuntimeIdentifier => "osx-x64";
public override DevicePlatform ApplePlatform => DevicePlatform.macOS;
public override string TargetFramework => "net5.0-macos";
public override string TargetFramework => "net6.0-macos";
public override string TargetFrameworkForNuGet => "xamarinmac10";
protected override bool FixProjectReference (string include, string subdir, string suffix, out string fixed_include)

2
tests/xharness/Targets/TVOSTarget.cs
Просмотреть файл

@ -96,7 +96,7 @@ namespace Xharness.Targets {
public override string DotNetSdk => "Microsoft.tvOS.Sdk";
public override string RuntimeIdentifier => "tvos-x64";
public override DevicePlatform ApplePlatform => DevicePlatform.tvOS;
public override string TargetFramework => "net5.0-tvos";
public override string TargetFramework => "net6.0-tvos";
public override string TargetFrameworkForNuGet => "xamarintvos10";
static Dictionary<string, string> project_guids = new Dictionary<string, string> ();

2
tests/xharness/Targets/UnifiedTarget.cs
Просмотреть файл

@ -127,7 +127,7 @@ namespace Xharness.Targets {
public override string DotNetSdk => "Microsoft.iOS.Sdk";
public override string RuntimeIdentifier => "ios-x64";
public override DevicePlatform ApplePlatform => DevicePlatform.iOS;
public override string TargetFramework => "net5.0-ios";
public override string TargetFramework => "net6.0-ios";
public override string TargetFrameworkForNuGet => "xamarinios10";
}
}

2
tests/xharness/Targets/WatchOSTarget.cs
Просмотреть файл

@ -31,7 +31,7 @@ namespace Xharness.Targets {
public override string DotNetSdk => "Microsoft.watchOS.Sdk";
public override string RuntimeIdentifier => throw new NotImplementedException ();
public override DevicePlatform ApplePlatform => DevicePlatform.watchOS;
public override string TargetFramework => "net5.0-watchos";
public override string TargetFramework => "net6.0-watchos";
public override string TargetFrameworkForNuGet => "xamarinwatch10";
void CreateWatchOSAppProject ()

16
tools/common/TargetFramework.cs
Просмотреть файл

@ -14,10 +14,10 @@ namespace Xamarin.Utils
{
public struct TargetFramework : IEquatable<TargetFramework>
{
public const string DotNet_5_0_iOS_String = ".NETCoreApp,Version=5.0,Profile=ios"; // Short form: net5.0-ios
public const string DotNet_5_0_tvOS_String = ".NETCoreApp,Version=5.0,Profile=tvos"; // Short form: net5.0-tvos
public const string DotNet_5_0_watchOS_String = ".NETCoreApp,Version=5.0,Profile=watchos"; // Short form: net5.0-watchos
public const string DotNet_5_0_macOS_String = ".NETCoreApp,Version=5.0,Profile=macos"; // Short form: net5.0-macos
public const string DotNet_6_0_iOS_String = ".NETCoreApp,Version=6.0,Profile=ios"; // Short form: net6.0-ios
public const string DotNet_6_0_tvOS_String = ".NETCoreApp,Version=6.0,Profile=tvos"; // Short form: net6.0-tvos
public const string DotNet_6_0_watchOS_String = ".NETCoreApp,Version=6.0,Profile=watchos"; // Short form: net6.0-watchos
public const string DotNet_6_0_macOS_String = ".NETCoreApp,Version=6.0,Profile=macos"; // Short form: net6.0-macos
public static readonly TargetFramework Empty = new TargetFramework ();
public static readonly TargetFramework Net_2_0 = Parse ("2.0");
@ -35,10 +35,10 @@ namespace Xamarin.Utils
public static readonly TargetFramework Xamarin_Mac_4_5_Full = Parse ("Xamarin.Mac,Version=v4.5,Profile=Full");
public static readonly TargetFramework Xamarin_Mac_4_5_System = Parse ("Xamarin.Mac,Version=v4.5,Profile=System");
public static readonly TargetFramework DotNet_5_0_iOS = Parse (DotNet_5_0_iOS_String);
public static readonly TargetFramework DotNet_5_0_tvOS = Parse (DotNet_5_0_tvOS_String);
public static readonly TargetFramework DotNet_5_0_watchOS = Parse (DotNet_5_0_watchOS_String);
public static readonly TargetFramework DotNet_5_0_macOS = Parse (DotNet_5_0_macOS_String);
public static readonly TargetFramework DotNet_5_0_iOS = Parse (DotNet_6_0_iOS_String);
public static readonly TargetFramework DotNet_5_0_tvOS = Parse (DotNet_6_0_tvOS_String);
public static readonly TargetFramework DotNet_5_0_watchOS = Parse (DotNet_6_0_watchOS_String);
public static readonly TargetFramework DotNet_5_0_macOS = Parse (DotNet_6_0_macOS_String);
public static readonly TargetFramework [] ValidFrameworksMac = new [] {
Xamarin_Mac_2_0_Mobile, Xamarin_Mac_4_5_Full, Xamarin_Mac_4_5_System,

6
tools/dotnet-linker/Makefile
Просмотреть файл

@ -14,12 +14,12 @@ DOTNET_DIRECTORIES += \
$(foreach platform,$(DOTNET_PLATFORMS),$(DOTNET_DESTDIR)/Microsoft.$(platform).Sdk/tools/dotnet-linker) \
# dotnet-linker.csproj.inc contains the dotnet_linker_dependencies variable used to determine if mtouch needs to be rebuilt or not.
dotnet-linker.csproj.inc: export BUILD_EXECUTABLE=$(DOTNET5) build
dotnet-linker.csproj.inc: export BUILD_EXECUTABLE=$(DOTNET6) build
dotnet-linker.csproj.inc: global.json
-include dotnet-linker.csproj.inc
$(BUILD_DIR)/dotnet-linker%dll $(BUILD_DIR)/dotnet-linker%pdb: Makefile global.json $(dotnet_linker_dependencies)
$(Q_DOTNET_BUILD) $(DOTNET5) build $(XBUILD_VERBOSITY)
$(Q_DOTNET_BUILD) $(DOTNET6) build $(XBUILD_VERBOSITY)
$(DOTNET_DESTDIR)/Microsoft.iOS.Sdk/tools/dotnet-linker/%: $(BUILD_DIR)/% | $(DOTNET_DESTDIR)/Microsoft.iOS.Sdk/tools/dotnet-linker
$(Q) $(CP) $< $@
@ -40,7 +40,7 @@ $(DOTNET_DIRECTORIES):
global.json: $(TOP)/Make.config.inc Makefile $(TOP)/.git/HEAD $(TOP)/.git/index
$(Q_GEN) \
printf "{\n" > $@; \
printf "\t\"sdk\": { \"version\": \"$(DOTNET5_VERSION)\" }\n" >> $@; \
printf "\t\"sdk\": { \"version\": \"$(DOTNET6_VERSION)\" }\n" >> $@; \
printf "}\n" >> $@
all-local:: $(DOTNET_TARGETS)

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше