Skip to content

Commit

Permalink
Merge branch 'main' into xcode13.0-iTunesLibrary-b1
Browse files Browse the repository at this point in the history
  • Loading branch information
rachelkang authored Jul 6, 2021
2 parents 9da7629 + 3b6f059 commit 3112f6d
Show file tree
Hide file tree
Showing 36 changed files with 1,918 additions and 1,730 deletions.
1 change: 1 addition & 0 deletions builds/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
dotnet-install.sh
BundledNETCorePlatformsPackageVersion.txt
downloads
.stamp*
Expand Down
23 changes: 12 additions & 11 deletions builds/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ DOWNLOADS = \
downloads/$(MONO_IOS_FILENAME) \
downloads/$(MONO_MAC_FILENAME) \
downloads/$(MONO_MACCATALYST_FILENAME) \
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
Expand Down Expand Up @@ -65,16 +64,6 @@ downloads/%: downloads/%.7z
$(Q) mv $@.tmp $@
$(Q) echo "Unzipped $*."

downloads/%: downloads/%.tar.gz
$(Q) echo "Untarring $*..."
$(Q) rm -Rf $@.tmp
$(Q) mkdir -p $@.tmp
$(Q) tar xf $< -C $@.tmp
$(Q) xattr -s -d -r com.apple.quarantine $@.tmp
$(Q) find $@.tmp -exec touch {} +
$(Q) mv $@.tmp $@
$(Q) echo "Untarred $*."

downloads/%: downloads/%.nupkg
$(Q) echo "Unzipping $*..."
$(Q) rm -Rf $@.tmp
Expand All @@ -83,6 +72,18 @@ downloads/%: downloads/%.nupkg
$(Q) mv $@.tmp $@
$(Q) echo "Unzipped $*."

downloads/$(basename $(basename $(DOTNET6_TARBALL_NAME))): dotnet-install.sh
$(Q) echo "Downloading and installing .NET $(DOTNET6_VERSION) into $@..."
$(Q) ./dotnet-install.sh --install-dir "$@.tmp" --version "$(DOTNET6_VERSION)" --architecture x64 --no-path
$(Q) rm -Rf "$@"
$(Q) mv "$@.tmp" "$@"
$(Q) echo "Downloaded and installed .NET $(DOTNET6_VERSION) into $@."

dotnet-install.sh: Makefile
$(Q) curl --retry 20 --retry-delay 2 --connect-timeout 15 -S -L $(if $(V),-v,-s) https://dot.net/v1/dotnet-install.sh --output $@.tmp
$(Q) chmod +x $@.tmp
$(Q) mv $@.tmp $@

# Fix the BCL assemblies we get for Mac Catalyst
fix-maccatalyst-assembly/bin/Debug/fix-maccatalyst-assembly.exe: $(wildcard fix-maccatalyst-assembly/*.cs*) Makefile
$(Q) $(SYSTEM_MSBUILD) /r fix-maccatalyst-assembly/fix-maccatalyst-assembly.csproj $(MSBUILD_VERBOSITY)
Expand Down
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.7.21327.2">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.7.21330.1">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>e8b3b6bea1e37086869ba9aeafe65caa298537e7</Sha>
<Sha>823ff33acf9c67374d4b1211850b22d3db7f020d</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21322.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21329.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/mono/linker</Uri>
<Sha>a07cab7b71a1321a9e68571c0b6095144a177b4e</Sha>
<Sha>f549b4e8bfdf07c31f2540d05f55b50af0e2f391</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.7.21327.2</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21322.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.7.21330.1</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21329.2</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
</PropertyGroup>
</Project>
1 change: 1 addition & 0 deletions src/EventKit/EKEnums.cs
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ public enum EKErrorCode : long {
SourceMismatch,
NotificationCollectionMismatch,
NotificationSavedWithoutCollection,
ReminderAlarmContainsEmailOrUrl,
}

// untyped enum -> EKTypes.h
Expand Down
1 change: 1 addition & 0 deletions src/ReplayKit/RPEnums.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ public enum RPRecordingError : long {
FailedToStartCaptureStack = -5833,
InvalidParameter = -5834,
FilePermissions = -5835,
ExportClipToUrlInProgress = -5836,
}

[NoiOS]
Expand Down
Loading

0 comments on commit 3112f6d

Please sign in to comment.