Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

Commit

Permalink
Merge master into SdkProj
Browse files Browse the repository at this point in the history
  • Loading branch information
eerhardt committed Jul 5, 2018
2 parents 6ccae92 + 2600d12 commit 0343b37
Show file tree
Hide file tree
Showing 303 changed files with 27,050 additions and 4,810 deletions.
5 changes: 5 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,8 @@
# Force bash scripts to always use lf line endings so that if a repo is accessed
# in Unix via a file share from Windows, the scripts will work.
*.sh text eol=lf

# Set linguist language for .h files explicitly based on
# https://github.com/github/linguist/issues/1626#issuecomment-401442069
# this only affects the repo's language statistics
*.h linguist-language=C
2 changes: 1 addition & 1 deletion BuildToolsVersion.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2.0-preview1-02928-01
2.2.0-preview1-03004-01
8 changes: 7 additions & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,9 @@
<PropertyGroup>
<TargetsNetCoreApp Condition="$(TargetGroup.StartsWith('netcoreapp'))">true</TargetsNetCoreApp>
<TargetsUap Condition="$(TargetGroup.StartsWith('uap'))">true</TargetsUap>
<TargetsNetStandard Condition="$(TargetGroup.StartsWith('netstandard'))">true</TargetsNetStandard>
<TargetsNetCoreApp Condition="$(TargetGroup.StartsWith('netcoreapp'))">true</TargetsNetCoreApp>
<TargetsAot Condition="$(TargetGroup.EndsWith('aot'))">true</TargetsAot>
<TargetsNetFx Condition="$(TargetGroup.StartsWith('net4')) OR '$(TargetGroup)' == 'netfx'">true</TargetsNetFx>
</PropertyGroup>

Expand Down Expand Up @@ -311,6 +314,9 @@
<PackagesBasePath Condition="'$(PackagesBasePath)'==''">$(BinDir)$(OSPlatformConfig)</PackagesBasePath>
<PackageOutputPath Condition="'$(PackageOutputPath)'==''">$(PackageOutputRoot)$(ConfigurationGroup)/</PackageOutputPath>
<SymbolPackageOutputPath Condition="'$(SymbolPackageOutputPath)'==''">$(PackageOutputPath)symbols/</SymbolPackageOutputPath>

<!-- interop is not available on NETStandard1.0 -->
<IncludeDllSafeSearchPathAttribute Condition="'$(TargetGroup)' == 'netstandard1.0'">false</IncludeDllSafeSearchPathAttribute>
</PropertyGroup>

<!-- Set up default paths for reference assemblies -->
Expand All @@ -330,7 +336,7 @@
</PropertyGroup>

<PropertyGroup>
<OptionalToolingJsonPath>$(ProjectDir)\external\test-runtime\optional.json</OptionalToolingJsonPath>
<OptionalToolingProjectPath>$(ProjectDir)\external\test-runtime\optional.csproj</OptionalToolingProjectPath>
</PropertyGroup>

<PropertyGroup>
Expand Down
12 changes: 6 additions & 6 deletions Documentation/coding-guidelines/coding-style.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
C# Coding Style
===============

For C++ files (*.cpp and *.h), we use clang-format (version 3.6+) to ensure code styling. After changing any Cpp or H file and before merging, be sure to run src/Native/format-code.sh; this script will ensure that all native code files adhere to the coding style guidelines.
For C++ files (*.cpp and *.h), we use clang-format (version 3.6+) to ensure code styling. After changing any Cpp or H file and before merging, src/Native/format-code.sh must be run. This script will ensure that all native code files adhere to the coding style guidelines.

For non code files (xml etc) our current best guidance is consistency. When editing files, keep new code and changes consistent with the style in the files. For new files, it should conform to the style for that component. Last, if there's a completely new component, anything that is reasonably broadly accepted is fine.
For non code files (xml, etc), our current best guidance is consistency. When editing files, keep new code and changes consistent with the style in the files. For new files, it should conform to the style for that component. If there is a completely new component, anything that is reasonably broadly accepted is fine.

The general rule we follow is "use Visual Studio defaults".

1. We use [Allman style](http://en.wikipedia.org/wiki/Indent_style#Allman_style) braces, where each brace begins on a new line. A single line statement block can go without braces but the block must be properly indented on its own line and it must not be nested in other statement blocks that use braces (See issue [381](https://github.com/dotnet/corefx/issues/381) for examples).
1. We use [Allman style](http://en.wikipedia.org/wiki/Indent_style#Allman_style) braces, where each brace begins on a new line. A single line statement block can go without braces but the block must be properly indented on its own line and must not be nested in other statement blocks that use braces (See issue [381](https://github.com/dotnet/corefx/issues/381) for examples).
2. We use four spaces of indentation (no tabs).
3. We use `_camelCase` for internal and private fields and use `readonly` where possible. Prefix internal and private instance fields with `_`, static fields with `s_` and thread static fields with `t_`. When used on static fields, `readonly` should come after `static` (e.g. `static readonly` not `readonly static`). Public fields should be used sparingly, but when they are used, they should use PascalCasing, no prefix.
3. We use `_camelCase` for internal and private fields and use `readonly` where possible. Prefix internal and private instance fields with `_`, static fields with `s_` and thread static fields with `t_`. When used on static fields, `readonly` should come after `static` (e.g. `static readonly` not `readonly static`). Public fields should be used sparingly and should use PascalCasing with no prefix when used.
4. We avoid `this.` unless absolutely necessary.
5. We always specify the visibility, even if it's the default (e.g.
`private string _foo` not `string _foo`). Visibility should be the first modifier (e.g.
`public abstract` not `abstract public`).
6. Namespace imports should be specified at the top of the file, *outside* of
`namespace` declarations and should be sorted alphabetically.
`namespace` declarations, and should be sorted alphabetically.
7. Avoid more than one empty line at any time. For example, do not have two
blank lines between members of a type.
8. Avoid spurious free spaces.
For example avoid `if (someVar == 0)...`, where the dots mark the spurious free spaces.
Consider enabling "View White Space (Ctrl+E, S)" if using Visual Studio, to aid detection.
Consider enabling "View White Space (Ctrl+E, S)" if using Visual Studio to aid detection.
9. If a file happens to differ in style from these guidelines (e.g. private members are named `m_member`
rather than `_member`), the existing style in that file takes precedence.
10. We only use `var` when it's obvious what the variable type is (e.g. `var stream = new FileStream(...)` not `var stream = OpenStandardInput()`).
Expand Down
4 changes: 2 additions & 2 deletions Documentation/coding-guidelines/project-guidelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ once before you can iterate and work on a given library project.
- Build product
- Build src\src.builds which builds all the source library projects. For source library project information see [src](#src).
- Sign product
- Build src\sign.builds
//**CONSIDER**: We should make this as part of the src.builds file instead of a separate .builds file.
- Build src\sign.proj
//**CONSIDER**: We should make this as part of the src.builds file instead of a separate project file.

## Behind the scenes with build-test.cmd/sh
- build-test.cmd cannot be ran successfully until build.cmd has been ran at least once for a `BuildConfiguration`.
Expand Down
2 changes: 1 addition & 1 deletion build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<Project Include="src\dirs.proj" />
<Project Include="src\tests.builds" Condition="'$(BuildTests)'=='true'" />
<!-- signing must happen before packaging -->
<Project Include="src\sign.builds" />
<Project Include="src\sign.proj" />
<Project Include="src\packages.builds" Condition="'$(BuildPackages)'=='true'" />
</ItemGroup>

Expand Down
41 changes: 21 additions & 20 deletions dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
These ref versions are pulled from https://github.com/dotnet/versions.
-->
<PropertyGroup>
<CoreFxCurrentRef>13ca435e8c2b6c8eed73589533a175c283b71f77</CoreFxCurrentRef>
<CoreClrCurrentRef>13ca435e8c2b6c8eed73589533a175c283b71f77</CoreClrCurrentRef>
<CoreSetupCurrentRef>13ca435e8c2b6c8eed73589533a175c283b71f77</CoreSetupCurrentRef>
<CoreFxCurrentRef>491bc0f8b88823aa9e6ab717a706b4e09576ad4a</CoreFxCurrentRef>
<CoreClrCurrentRef>e246e64dc41385c56c7bdb241c9b8b5df89c068c</CoreClrCurrentRef>
<CoreSetupCurrentRef>491bc0f8b88823aa9e6ab717a706b4e09576ad4a</CoreSetupCurrentRef>
<ExternalCurrentRef>96dc7805f5df4a70a55783964ce69dcd91bfca80</ExternalCurrentRef>
<ProjectNTfsCurrentRef>13ca435e8c2b6c8eed73589533a175c283b71f77</ProjectNTfsCurrentRef>
<ProjectNTfsTestILCCurrentRef>13ca435e8c2b6c8eed73589533a175c283b71f77</ProjectNTfsTestILCCurrentRef>
<ProjectNTfsCurrentRef>e246e64dc41385c56c7bdb241c9b8b5df89c068c</ProjectNTfsCurrentRef>
<ProjectNTfsTestILCCurrentRef>e246e64dc41385c56c7bdb241c9b8b5df89c068c</ProjectNTfsTestILCCurrentRef>
<SniCurrentRef>8bd1ec5fac9f0eec34ff6b34b1d878b4359e02dd</SniCurrentRef>
<StandardCurrentRef>9004703a1923e5c5582ceb8d79712df777412446</StandardCurrentRef>
<BuildToolsCurrentRef>13ca435e8c2b6c8eed73589533a175c283b71f77</BuildToolsCurrentRef>
<BuildToolsCurrentRef>e246e64dc41385c56c7bdb241c9b8b5df89c068c</BuildToolsCurrentRef>
</PropertyGroup>

<!-- Product dependency versions. -->
Expand All @@ -31,32 +31,36 @@

<!-- Tests/infrastructure dependency versions. -->
<PropertyGroup>
<CoreFxExpectedPrerelease>preview1-26628-01</CoreFxExpectedPrerelease>
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview1-26628-01</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview1-26628-01</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<ProjectNTfsExpectedPrerelease>beta-26627-00</ProjectNTfsExpectedPrerelease>
<ProjectNTfsTestILCExpectedPrerelease>beta-26627-00</ProjectNTfsTestILCExpectedPrerelease>
<ProjectNTfsTestILCPackageVersion>1.0.0-beta-26627-00</ProjectNTfsTestILCPackageVersion>
<MicrosoftNETCoreDotNetHostPackageVersion>3.0.0-preview1-26627-03</MicrosoftNETCoreDotNetHostPackageVersion>
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>3.0.0-preview1-26627-03</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview1-26627-03</MicrosoftNETCoreAppPackageVersion>
<CoreFxExpectedPrerelease>preview1-26704-05</CoreFxExpectedPrerelease>
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview1-26704-05</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview1-26704-01</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<ProjectNTfsExpectedPrerelease>beta-26704-00</ProjectNTfsExpectedPrerelease>
<ProjectNTfsTestILCExpectedPrerelease>beta-26704-00</ProjectNTfsTestILCExpectedPrerelease>
<ProjectNTfsTestILCPackageVersion>1.0.0-beta-26704-00</ProjectNTfsTestILCPackageVersion>
<MicrosoftNETCoreDotNetHostPackageVersion>3.0.0-preview1-26704-01</MicrosoftNETCoreDotNetHostPackageVersion>
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>3.0.0-preview1-26704-01</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview1-26704-01</MicrosoftNETCoreAppPackageVersion>

<!-- CoreFX-built SNI identity package -->
<RuntimeNativeSystemDataSqlClientSniPackageVersion>4.4.0</RuntimeNativeSystemDataSqlClientSniPackageVersion>

<AppXRunnerVersion>2.2.0-preview1-02915-01</AppXRunnerVersion>
<XunitPerfAnalysisPackageVersion>1.0.0-beta-build0019</XunitPerfAnalysisPackageVersion>
<TraceEventPackageVersion>2.0.5</TraceEventPackageVersion>
<XunitNetcoreExtensionsVersion>2.2.0-preview1-02928-01</XunitNetcoreExtensionsVersion>
<XunitNetcoreExtensionsVersion>2.2.0-preview1-03004-01</XunitNetcoreExtensionsVersion>

<!-- Roslyn optimization data package version -->
<MicrosoftDotNetIBCMergePackageVersion>4.6.0-alpha-00001</MicrosoftDotNetIBCMergePackageVersion>
<TestILCAmd64retPackageVersion>$(ProjectNTfsTestILCPackageVersion)</TestILCAmd64retPackageVersion>
<TestILCArmretPackageVersion>$(ProjectNTfsTestILCPackageVersion)</TestILCArmretPackageVersion>
<TestILCX86retPackageVersion>$(ProjectNTfsTestILCPackageVersion)</TestILCX86retPackageVersion>
<OptimizationDataVersion>2.0.0-rc-61101-17</OptimizationDataVersion>
</PropertyGroup>

<!-- Package versions used as toolsets -->
<PropertyGroup>
<FeedTasksPackage>Microsoft.DotNet.Build.Tasks.Feed</FeedTasksPackage>
<FeedTasksPackageVersion>2.2.0-preview1-02928-01</FeedTasksPackageVersion>
<FeedTasksPackageVersion>2.2.0-preview1-03004-01</FeedTasksPackageVersion>
</PropertyGroup>

<!-- Publish symbol build task package -->
Expand Down Expand Up @@ -240,9 +244,6 @@
<PackageId>microsoft.xunit.runner.uwp</PackageId>
<Version>$(AppXRunnerVersion)</Version>
</DependencyBuildInfo>

<!-- project.json files to update -->
<ProjectJsonFiles Include="$(MSBuildThisFileDirectory)external\**\optional.json" />
</ItemGroup>

<!-- Override isolated build dependency versions with versions from Repo API. -->
Expand Down
3 changes: 3 additions & 0 deletions external/harvestPackages/harvestPackages.props
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@
<PackageReference Include="System.Reflection.DispatchProxy">
<Version>4.4.0</Version>
</PackageReference>
<PackageReference Include="System.Reflection.Emit">
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="System.Reflection.Metadata">
<Version>1.5.0</Version>
</PackageReference>
Expand Down
9 changes: 9 additions & 0 deletions external/netstandard/netstandard.depproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,15 @@
<PackageReference Condition="'$(NETStandardVersion)' &gt;= 1.3" Include="System.Security.Cryptography.Cng">
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Condition="'$(NETStandardVersion)' &gt;= 1.1" Include="System.Reflection.Emit">
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="System.Reflection.Emit.ILGeneration">
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="System.Reflection.Emit.Lightweight">
<Version>4.3.0</Version>
</PackageReference>
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions external/runtime/Configurations.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<BuildConfigurations>
netcoreapp-Windows_NT;
netcoreapp-Unix;
uap10.0.16299;
uap10.0.16299aot;
uap;
uapaot;
Expand Down
6 changes: 5 additions & 1 deletion external/runtime/runtime.depproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
</PropertyGroup>
<ItemGroup Condition="'$(TargetGroup)'=='uapaot' Or '$(TargetGroup)' == 'uap10.0.16299aot'">
<PackageReference Include="Microsoft.TargetingPack.Private.NETNative">
<Version>1.1.0-$(ProjectNTfsExpectedPrerelease)</Version>
<Version Condition="'$(TargetGroup)'=='uapaot'">1.1.0-$(ProjectNTfsExpectedPrerelease)</Version>
<!-- Following is version used in release/uwp6.0 -->
<Version Condition="'$(TargetGroup)'=='uap10.0.16299aot'">1.1.0-rel-25728-00</Version>
</PackageReference>
<FileToExclude Include="System.Private.CoreLib.Augments" />
<FileToExclude Include="System.Private.CoreLib.DynamicDelegate" />
Expand All @@ -29,6 +31,8 @@
</PackageReference>
<PackageReference Include="Microsoft.NETCore.Runtime.CoreCLR">
<Version>$(MicrosoftNETCoreRuntimeCoreCLRPackageVersion)</Version>
<!-- Following is version used in release/uwp6.0 -->
<Version Condition="'$(TargetGroup)'=='uap10.0.16299'">2.1.0-b-uwp6-25707-02</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.TestHost">
<Version>$(MicrosoftNETCoreRuntimeCoreCLRPackageVersion)</Version>
Expand Down
12 changes: 12 additions & 0 deletions external/test-runtime/optional.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\dependencies.props" />
<PropertyGroup>
<TargetFramework>net45</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.IBCMerge" Version="$(MicrosoftDotNetIBCMergePackageVersion)" />
<PackageReference Include="TestILC.amd64ret" Version="$(TestILCAmd64retPackageVersion)" />
<PackageReference Include="TestILC.armret" Version="$(TestILCArmretPackageVersion)" />
<PackageReference Include="TestILC.x86ret" Version="$(TestILCX86retPackageVersion)" />
</ItemGroup>
</Project>
12 changes: 0 additions & 12 deletions external/test-runtime/optional.json

This file was deleted.

14 changes: 9 additions & 5 deletions pkg/Microsoft.Private.PackageBaseline/packageIndex.json
Original file line number Diff line number Diff line change
Expand Up @@ -863,6 +863,9 @@
"System.ComponentModel.Composition.Registration": {
"InboxOn": {
"net45": "4.0.0.0"
},
"AssemblyVersionInPackageVersion": {
"4.0.0.0": "4.6.0"
}
},
"System.ComponentModel.DataAnnotations": {
Expand Down Expand Up @@ -2444,7 +2447,6 @@
"System.Memory": {
"InboxOn": {
"netcoreapp2.1": "4.1.0.0",
"netcoreapp3.0": "4.1.0.0",
"monoandroid10": "Any",
"monotouch10": "Any",
"uap10.0.16300": "4.1.0.0",
Expand Down Expand Up @@ -3236,7 +3238,8 @@
"4.0.0.0": "4.0.0",
"4.0.1.0": "4.0.1",
"4.0.2.0": "4.3.0",
"4.0.3.0": "4.3.0"
"4.0.3.0": "4.3.0",
"4.1.1.0": "4.6.0"
}
},
"System.Reflection.Emit.ILGeneration": {
Expand All @@ -3261,7 +3264,8 @@
"AssemblyVersionInPackageVersion": {
"4.0.0.0": "4.0.0",
"4.0.1.0": "4.0.1",
"4.0.2.0": "4.3.0"
"4.0.2.0": "4.3.0",
"4.0.3.0": "4.6.0"
}
},
"System.Reflection.Emit.Lightweight": {
Expand All @@ -3286,7 +3290,8 @@
"AssemblyVersionInPackageVersion": {
"4.0.0.0": "4.0.0",
"4.0.1.0": "4.0.1",
"4.0.2.0": "4.3.0"
"4.0.2.0": "4.3.0",
"4.0.3.0": "4.6.0"
}
},
"System.Reflection.Extensions": {
Expand Down Expand Up @@ -4981,7 +4986,6 @@
"monotouch10": "Any",
"netcoreapp2.0": "4.1.1.0",
"netcoreapp2.1": "4.3.0.0",
"netcoreapp3.0": "4.3.0.0",
"uap10.0.16300": "4.3.0.0",
"xamarinios10": "Any",
"xamarinmac20": "Any",
Expand Down
12 changes: 12 additions & 0 deletions pkg/descriptions.json
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,18 @@
"System.ComponentModel.Composition.ReflectionModel.ReflectionModelServices"
]
},
{
"Name": "System.ComponentModel.Composition.Registration",
"Description": "This namespace provides classes that constitute the core of the Managed Extensibility Framework, or MEF.",
"CommonTypes": [
"System.ComponentModel.Composition.Registration.RegistrationBuilder",
"System.ComponentModel.Composition.Registration.PartBuilder",
"System.ComponentModel.Composition.Registration.PartBuilder<T>",
"System.ComponentModel.Composition.Registration.ParameterImportBuilder",
"System.ComponentModel.Composition.Registration.ImportBuilder",
"System.ComponentModel.Composition.Registration.ExportBuilder"
]
},
{
"Name": "System.ComponentModel.EventBasedAsync",
"Description": "Provides support classes and delegates for the event-based asynchronous pattern. Developers should prefer the classes in the System.Threading.Tasks package.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,11 @@ internal static partial class Globalization
[DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_CompareString")]
internal static extern unsafe int CompareString(SafeSortHandle sortHandle, char* lpStr1, int cwStr1Len, char* lpStr2, int cwStr2Len, CompareOptions options);

[DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_IndexOf")]
internal static extern unsafe int IndexOf(SafeSortHandle sortHandle, string target, int cwTargetLength, char* pSource, int cwSourceLength, CompareOptions options, int* matchLengthPtr);
[DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_IndexOf")]
internal static extern unsafe int IndexOf(SafeSortHandle sortHandle, char* target, int cwTargetLength, char* pSource, int cwSourceLength, CompareOptions options, int* matchLengthPtr);

[DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_LastIndexOf")]
internal static extern unsafe int LastIndexOf(SafeSortHandle sortHandle, string target, int cwTargetLength, char* pSource, int cwSourceLength, CompareOptions options);
internal static extern unsafe int LastIndexOf(SafeSortHandle sortHandle, char* target, int cwTargetLength, char* pSource, int cwSourceLength, CompareOptions options);

[DllImport(Libraries.GlobalizationNative, CharSet = CharSet.Unicode, EntryPoint = "GlobalizationNative_IndexOfOrdinalIgnoreCase")]
internal static extern unsafe int IndexOfOrdinalIgnoreCase(string target, int cwTargetLength, char* pSource, int cwSourceLength, bool findLast);
Expand Down
Loading

0 comments on commit 0343b37

Please sign in to comment.