Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-dotnet -->
<add key="darc-pub-dotnet-dotnet-5a7ae45" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-5a7ae45d/nuget/v3/index.json" />
<add key="darc-pub-dotnet-dotnet-dfdd32e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-dfdd32e8/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!-- Begin: Package sources from dotnet-macios -->
<!-- End: Package sources from dotnet-macios -->
Expand Down
8 changes: 4 additions & 4 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet-dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26371.110</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.26371.110</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26374.115</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.26374.115</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.26070.104</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.26371.110</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.26374.115</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>10.0.3-servicing.26070.104</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.3</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>10.0.3</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.400-preview.0.26371.110</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.400-preview.0.26374.115</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.3</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.400</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<!-- dotnet-macios dependencies -->
Expand Down
18 changes: 9 additions & 9 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.400-preview.0.26371.110">
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.400-preview.0.26374.115">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5a7ae45dbddbaf6a1545a974c52edad5f94a04e0</Sha>
<Sha>dfdd32e8a9349462e71f687679bc7e5837b8ef4a</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="10.0.3-servicing.26070.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
Expand Down Expand Up @@ -95,25 +95,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.26371.110">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.26374.115">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5a7ae45dbddbaf6a1545a974c52edad5f94a04e0</Sha>
<Sha>dfdd32e8a9349462e71f687679bc7e5837b8ef4a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.26371.110">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.26374.115">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5a7ae45dbddbaf6a1545a974c52edad5f94a04e0</Sha>
<Sha>dfdd32e8a9349462e71f687679bc7e5837b8ef4a</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.400">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5a7ae45dbddbaf6a1545a974c52edad5f94a04e0</Sha>
<Sha>dfdd32e8a9349462e71f687679bc7e5837b8ef4a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="11.0.0-prerelease.26370.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>65e5795252474ebd04e4e872bd4152e86c558209</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26371.110">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26374.115">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5a7ae45dbddbaf6a1545a974c52edad5f94a04e0</Sha>
<Sha>dfdd32e8a9349462e71f687679bc7e5837b8ef4a</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
Expand Down
2 changes: 2 additions & 0 deletions eng/common/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Param(
[string][Alias('v')]$verbosity = "minimal",
[string] $msbuildEngine = $null,
[bool] $warnAsError = $true,
[string] $warnNotAsError = '',
[bool] $nodeReuse = $true,
[switch] $buildCheck = $false,
[switch][Alias('r')]$restore,
Expand Down Expand Up @@ -70,6 +71,7 @@ function Print-Usage() {
Write-Host " -excludeCIBinarylog Don't output binary log (short: -nobl)"
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
Write-Host " -warnNotAsError <value> Sets a semi-colon delimited list of warning codes that should not be treated as errors"
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
Expand Down
6 changes: 6 additions & 0 deletions eng/common/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ usage()
echo " --prepareMachine Prepare machine for CI run, clean up processes after build"
echo " --nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
echo " --warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
echo " --warnNotAsError <value> Sets a semi-colon delimited list of warning codes that should not be treated as errors"
echo " --buildCheck <value> Sets /check msbuild parameter"
echo " --fromVMR Set when building from within the VMR"
echo ""
Expand Down Expand Up @@ -78,6 +79,7 @@ ci=false
clean=false

warn_as_error=true
warn_not_as_error=''
node_reuse=true
build_check=false
binary_log=false
Expand Down Expand Up @@ -176,6 +178,10 @@ while [[ $# > 0 ]]; do
warn_as_error=$2
shift
;;
-warnnotaserror)
warn_not_as_error=$2
shift
;;
-nodereuse)
node_reuse=$2
shift
Expand Down
8 changes: 8 additions & 0 deletions eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@
# Configures warning treatment in msbuild.
[bool]$warnAsError = if (Test-Path variable:warnAsError) { $warnAsError } else { $true }

# Specifies semi-colon delimited list of warning codes that should not be treated as errors.
[string]$warnNotAsError = if (Test-Path variable:warnNotAsError) { $warnNotAsError } else { '' }

# Specifies which msbuild engine to use for build: 'vs', 'dotnet' or unspecified (determined based on presence of tools.vs in global.json).
[string]$msbuildEngine = if (Test-Path variable:msbuildEngine) { $msbuildEngine } else { $null }

Expand Down Expand Up @@ -836,6 +839,11 @@ function MSBuild-Core() {
$cmdArgs += ' /p:TreatWarningsAsErrors=false'
}

if ($warnAsError -and $warnNotAsError) {
$escapedWarnNotAsError = $warnNotAsError -replace ';', '%3B'
$cmdArgs += " /warnnotaserror:$warnNotAsError /p:AdditionalWarningsNotAsErrors=$escapedWarnNotAsError"
}

foreach ($arg in $args) {
if ($null -ne $arg -and $arg.Trim() -ne "") {
if ($arg.EndsWith('\')) {
Expand Down
10 changes: 9 additions & 1 deletion eng/common/tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ fi
# Configures warning treatment in msbuild.
warn_as_error=${warn_as_error:-true}

# Specifies semi-colon delimited list of warning codes that should not be treated as errors.
warn_not_as_error=${warn_not_as_error:-''}

# True to attempt using .NET Core already that meets requirements specified in global.json
# installed on the machine instead of downloading one.
use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}
Expand Down Expand Up @@ -532,7 +535,12 @@ function MSBuild-Core {
mt_switch="-mt"
fi

RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch $mt_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@"
local warnnotaserror_switch=""
if [[ -n "$warn_not_as_error" && "$warn_as_error" == true ]]; then
warnnotaserror_switch="/warnnotaserror:$warn_not_as_error /p:AdditionalWarningsNotAsErrors=${warn_not_as_error//;/%3B}"
fi

RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch $mt_switch $warnnotaserror_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@"
}

function GetDarc {
Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"sdk": {
"version": "10.0.400-preview.0.26371.110",
"version": "10.0.400-preview.0.26374.115",
"paths": [
"builds/downloads/dotnet",
"$host$"
],
"errorMessage": "The .NET SDK could not be found, please run 'make dotnet -C builds'."
},
"tools": {
"dotnet": "10.0.400-preview.0.26371.110"
"dotnet": "10.0.400-preview.0.26374.115"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26371.110"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26374.115"
}
}
15 changes: 6 additions & 9 deletions src/Contacts/CNContactFetchRequest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,15 @@
namespace Contacts {
public partial class CNContactFetchRequest {

/// <param name="keysToFetch">To be added.</param>
/// <summary>Creates and returns a new <see cref="Contacts.CNContactFetchRequest" /> that retrieves data with the specified <paramref name="keysToFetch" />.</summary>
/// <remarks>To be added.</remarks>
/// <summary>Creates and returns a new <see cref="Contacts.CNContactFetchRequest" /> that retrieves data with the specified <paramref name="keysToFetch" />.</summary>
/// <param name="keysToFetch">The keys to fetch.</param>
public CNContactFetchRequest (params ICNKeyDescriptor [] keysToFetch)
: this (NSArray.FromNativeObjects (keysToFetch))
{
}

/// <param name="keysToFetch">To be added.</param>
/// <summary>Creates a new <see cref="Contacts.CNContactFetchRequest" /> that retrieves data with the specified <paramref name="keysToFetch" />.</summary>
/// <remarks>To be added.</remarks>
/// <summary>Creates a new <see cref="Contacts.CNContactFetchRequest" /> that retrieves data with the specified <paramref name="keysToFetch" />.</summary>
/// <param name="keysToFetch">The keys to fetch.</param>
public CNContactFetchRequest (params NSString [] keysToFetch)
: this (NSArray.FromNSObjects (keysToFetch))
{
Expand All @@ -29,9 +27,8 @@ public CNContactFetchRequest (params NSString [] keysToFetch)
// but a ctor using this (ICNKeyDescriptor) would not accept NSString
// so if you want to mix both NSString and (NSObjectProtocol, NSSecureCoding, NSCopying) you need to use
// this constructor, which will manually verify the requirements (at runtime, not a compile time)
/// <param name="keysToFetch">To be added.</param>
/// <summary>Creates a new <see cref="Contacts.CNContactFetchRequest" /> that retrieves data with the specified <paramref name="keysToFetch" />.</summary>
/// <remarks>To be added.</remarks>
/// <summary>Creates a new <see cref="Contacts.CNContactFetchRequest" /> that retrieves data with the specified <paramref name="keysToFetch" />.</summary>
/// <param name="keysToFetch">The keys to fetch.</param>
public CNContactFetchRequest (params INativeObject [] keysToFetch)
: this (Validate (keysToFetch))
{
Expand Down
9 changes: 2 additions & 7 deletions src/CoreImage/CIImageInitializationOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ namespace CoreImage {
public partial class CIImageInitializationOptions {
#if !COREBUILD
/// <summary>Gets or sets the color space.</summary>
/// <value>To be added.</value>
/// <remarks>To be added.</remarks>
public CGColorSpace? ColorSpace {
get {
return GetNativeValue<CGColorSpace> (CIImageInitializationOptionsKeys.ColorSpaceKey);
Expand All @@ -49,7 +47,6 @@ public CGColorSpace? ColorSpace {
}

/// <summary>A type of <see cref="CoreImage.CIImageInitializationOptions" /> that has additional metadata properties.</summary>
/// <remarks>To be added.</remarks>
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
Expand All @@ -58,14 +55,12 @@ public CGColorSpace? ColorSpace {
public class CIImageInitializationOptionsWithMetadata : CIImageInitializationOptions {
#if !COREBUILD
/// <summary>Creates a new CIImageInitializationOptionsWithMetadata with default values.</summary>
/// <remarks>To be added.</remarks>
public CIImageInitializationOptionsWithMetadata ()
{
}

/// <param name="dictionary">To be added.</param>
/// <summary>Creates a new CIImageInitializationOptionsWithMetadata by using the specified dictionary of options.</summary>
/// <remarks>To be added.</remarks>
/// <summary>Creates a new CIImageInitializationOptionsWithMetadata by using the specified dictionary of options.</summary>
/// <param name="dictionary">The dictionary.</param>
public CIImageInitializationOptionsWithMetadata (NSDictionary dictionary)
: base (dictionary)
{
Expand Down
65 changes: 21 additions & 44 deletions src/CoreVideo/CVTime.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,58 +48,45 @@ namespace CoreVideo {
public struct CVTime {

/// <summary>Determines how many TimeValues are represented by this CVTime.</summary>
/// <remarks>
/// </remarks>
public /* int64_t */ long TimeValue;
/// <summary>Determines how many TimeValues make up one second.</summary>
/// <remarks>
/// <para>
/// If the value of TimeScale is 600, that means that there are 600 TimeValues per second.
/// </para>
/// <para>
/// If the TimeScale is 600 and TimeValue is 2,400 that means that the CVTime represents four seconds.
/// </para>
/// </remarks>
/// <remarks>
/// <para>
/// If the value of TimeScale is 600, that means that there are 600 TimeValues per second.
/// </para>
/// <para>
/// If the TimeScale is 600 and TimeValue is 2,400 that means that the CVTime represents four seconds.
/// </para>
/// </remarks>
public /* int64_t */ long TimeScale;
/// <summary>Flags for CVTime, if set to 1, the CVTime is indefinite and neither the TimeValue and TimeScale are valid.</summary>
/// <remarks>Currently only the value 1 is supported, the CVTime is indefinite. </remarks>
/// <remarks>Currently only the value 1 is supported, the CVTime is indefinite.</remarks>
public /* int32_t */ CVTimeFlags TimeFlags;

/// <summary>Flags for CVTime, if set to IsIndefinite, the CVTime is indefinite and neither the TimeValue and TimeScale are valid.</summary>
/// <value>
/// </value>
/// <remarks>Currently only the value IsIndefinited is supported, the CVTime is indefinite. </remarks>
/// <remarks>Currently only the value IsIndefinited is supported, the CVTime is indefinite.</remarks>
public int Flags { get { return (int) TimeFlags; } set { TimeFlags = (CVTimeFlags) value; } }

#if !COREBUILD
/// <summary>Represents a zero duration..</summary>
/// <value>
/// </value>
/// <remarks>
/// </remarks>
/// <summary>Represents a zero duration.</summary>
public static CVTime ZeroTime {
get {
return Marshal.PtrToStructure<CVTime> (Dlfcn.GetIndirect (Libraries.CoreVideo.Handle, "kCVZeroTime"))!;
}
}

/// <summary>Unknown or indefinite time.</summary>
/// <value>
/// </value>
/// <remarks>
/// </remarks>
public static CVTime IndefiniteTime {
get {
return Marshal.PtrToStructure<CVTime> (Dlfcn.GetIndirect (Libraries.CoreVideo.Handle, "kCVIndefiniteTime"))!;
}
}
#endif

/// <summary>Determines whether two CVTime objects are equal.</summary>
/// <param name="other">Object to compare with.</param>
/// <summary>Determines whether two CVTime objects are equal.</summary>
/// <returns>
/// </returns>
/// <remarks>Two CVTime structures are considered to be equal if their TimeValue, TimeScale and Flags fields are the same.</remarks>
/// <returns><see langword="true" /> if the two CVTime objects are equal; otherwise, <see langword="false" />.</returns>
/// <remarks>Two CVTime structures are considered to be equal if their TimeValue, TimeScale and Flags fields are the same.</remarks>
public override bool Equals (object? other)
{
if (!(other is CVTime))
Expand All @@ -111,38 +98,28 @@ public override bool Equals (object? other)
}

/// <summary>Returns the hashcode for this object.</summary>
/// <returns>
/// </returns>
/// <remarks>
/// </remarks>
public override int GetHashCode ()
{
return HashCode.Combine (TimeValue, TimeScale, Flags);
}

// CVHostTime.h

/// <summary>To be added.</summary>
/// <returns>To be added.</returns>
/// <remarks>To be added.</remarks>
/// <summary>Returns the current value of the host time clock, in units of the host time clock frequency.</summary>
[DllImport (Constants.CoreVideoLibrary, EntryPoint = "CVGetCurrentHostTime")]
public static extern /* uint64_t */ ulong GetCurrentHostTime ();


/// <summary>Returns the system's clock frequency.</summary>
/// <returns>
/// </returns>
/// <remarks>
/// <para>
/// The value 1,000,000,000 would represent a nanosecond (10^-9).
/// </para>
/// </remarks>
/// <remarks>
/// <para>
/// The value 1,000,000,000 would represent a nanosecond (10^-9).
/// </para>
/// </remarks>
[DllImport (Constants.CoreVideoLibrary, EntryPoint = "CVGetHostClockFrequency")]
public static extern /* double */ double GetHostClockFrequency ();

/// <summary>To be added.</summary>
/// <returns>To be added.</returns>
/// <remarks>To be added.</remarks>
/// <summary>Returns the smallest time delta that the host clock can represent.</summary>
[DllImport (Constants.CoreVideoLibrary, EntryPoint = "CVGetHostClockMinimumTimeDelta")]
public static extern /* uint32_t */ uint GetHostClockMinimumTimeDelta ();
}
Expand Down
Loading
Loading