Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump to .NET 6.0.100-alpha.1.21060.3. #10388

Merged
merged 8 commits into from
Jan 14, 2021
Merged

Bump to .NET 6.0.100-alpha.1.21060.3. #10388

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8c48790
Bump to .NET 6.0.100-alpha.1.21060.3.
rolfbjarne Dec 18, 2020
96f3919
Fix dotnet command line arguments.
rolfbjarne Dec 4, 2020
88f7bfd
Update version number in tests.
rolfbjarne Jan 12, 2021
4f2b6b9
Merge remote-tracking branch 'origin/main' into dotnet-6.0.100-alpha.…
rolfbjarne Jan 13, 2021
686d93c
[tests/introspection] Adjust introspection to cope with different lib…
rolfbjarne Jan 13, 2021
88c1a34
[tests/link sdk] Adjust the LinkSdkRegressionTest.SpecialFolder test …
rolfbjarne Jan 13, 2021
ece7188
[tests/link sdk] Preserve a required method in System.Private.CoreLib…
rolfbjarne Jan 13, 2021
6d9fa3c
Revert "[CI][VSTS] Add the donet 6 pkg as a dependency. (#10348)"
rolfbjarne Jan 14, 2021
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
6 changes: 3 additions & 3 deletions Make.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,10 +475,10 @@ DOTNET_FEED_DIR ?= $(DOTNET_DESTDIR)/nuget-feed
# 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.
DOTNET6_VERSION=6.0.100-alpha.1.20562.2
DOTNET6_VERSION=6.0.100-alpha.1.21060.3
DOTNET6_VERSION_BAND=$(firstword $(subst -, ,$(DOTNET6_VERSION)))
DOTNET6_URL=https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.100-alpha.1.20562.2/dotnet-sdk-6.0.100-alpha.1.20562.2-osx-x64.pkg
DOTNET6_TARBALL=https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.100-alpha.1.20562.2/dotnet-sdk-6.0.100-alpha.1.20562.2-osx-x64.tar.gz
DOTNET6_URL=https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.100-alpha.1.21060.3/dotnet-sdk-6.0.100-alpha.1.21060.3-osx-x64.pkg
DOTNET6_TARBALL=https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.100-alpha.1.21060.3/dotnet-sdk-6.0.100-alpha.1.21060.3-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
Expand Down
3 changes: 3 additions & 0 deletions mk/quiet.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ MMP_VERBOSITY=-q
MTOUCH_VERBOSITY=-q
MDTOOL_VERBOSITY=
DOTNET_PACK_VERBOSITY=--verbosity:quiet --nologo
DOTNET_BUILD_VERBOSITY=--verbosity quiet
NUGET_VERBOSITY=-verbosity quiet
else
# CI build
Expand All @@ -79,6 +80,7 @@ MMP_VERBOSITY=-vvvv
MTOUCH_VERBOSITY=-vvvv
MDTOOL_VERBOSITY=-v -v -v -v
DOTNET_PACK_VERBOSITY=
DOTNET_BUILD_VERBOSITY=
NUGET_VERBOSITY=
endif
else
Expand All @@ -89,6 +91,7 @@ MMP_VERBOSITY=-vvvv
MTOUCH_VERBOSITY=-vvvv
MDTOOL_VERBOSITY=-v -v -v -v
DOTNET_PACK_VERBOSITY=--verbosity:detailed
DOTNET_BUILD_VERBOSITY=--verbosity detailed
NUGET_VERBOSITY=-verbosity detailed
endif
MSBUILD_VERBOSITY=$(XBUILD_VERBOSITY)
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.generator
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ $(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) $(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_DOTNET_BUILD) $(DOTNET6) publish bgen/bgen.csproj $(DOTNET_BUILD_VERBOSITY) /p:Configuration=Debug /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 $(DOTNET6) "$$(dirname "$$0")"/bgen.dll $$@\n' > $@
$(Q) chmod +x $@
Expand Down
8 changes: 6 additions & 2 deletions tools/common/create-makefile-fragment.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,18 @@ if test -z "$BUILD_EXECUTABLE"; then
BUILD_EXECUTABLE=msbuild
fi

if test -z "$BUILD_VERBOSITY"; then
BUILD_VERBOSITY=/verbosity:diag
fi

# ProjectInspector.csproj is an MSBuild file with a target
# (WriteProjectReferences) that takes another project file as input (the
# ProjectFile variable) and writes all the project references (recursively) to
# a file (the ReferenceListPath variable).
(
cp ProjectInspector.csproj "$PROJECT_DIR"
cd "$PROJECT_DIR"
$BUILD_EXECUTABLE ProjectInspector.csproj "/t:WriteProjectReferences" "/p:ProjectFile=$PROJECT_FILE" "/p:ReferenceListPath=$REFERENCES_PATH" /verbosity:quiet /nologo
$BUILD_EXECUTABLE ProjectInspector.csproj "/t:WriteProjectReferences" "/p:ProjectFile=$PROJECT_FILE" "/p:ReferenceListPath=$REFERENCES_PATH" $BUILD_VERBOSITY /nologo
rm -f ProjectInspector.csproj
)

Expand Down Expand Up @@ -91,7 +95,7 @@ for proj in $(sort "$REFERENCES_PATH" | uniq); do

(
cd "$(dirname "$proj")"
$BUILD_EXECUTABLE "$TMPPROJ" "/t:WriteInputs" "/p:ProjectFile=$proj" "/p:InputsPath=$inputs_path" /verbosity:quiet /nologo
$BUILD_EXECUTABLE "$TMPPROJ" "/t:WriteInputs" "/p:ProjectFile=$proj" "/p:InputsPath=$inputs_path" $BUILD_VERBOSITY /nologo
)

# The output contains relative paths, relative to the csproj directory
Expand Down
3 changes: 2 additions & 1 deletion tools/dotnet-linker/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ DOTNET_DIRECTORIES += \

# 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=$(DOTNET6) build
dotnet-linker.csproj.inc: export BUILD_VERBOSITY=$(DOTNET_BUILD_VERBOSITY)
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) $(DOTNET6) build $(XBUILD_VERBOSITY)
$(Q_DOTNET_BUILD) $(DOTNET6) build dotnet-linker.csproj $(DOTNET_BUILD_VERBOSITY)

$(DOTNET_DESTDIR)/Microsoft.iOS.Sdk/tools/dotnet-linker/%: $(BUILD_DIR)/% | $(DOTNET_DESTDIR)/Microsoft.iOS.Sdk/tools/dotnet-linker
$(Q) $(CP) $< $@
Expand Down