Skip to content

Commit 18fcffb

Browse files
author
Nate McMaster
committed
Merge branch 'release/2.1' into release/2.2
2 parents f108a87 + d0aa5c1 commit 18fcffb

File tree

255 files changed

+821
-649
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

255 files changed

+821
-649
lines changed

‎Directory.Build.props

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,38 @@
44
Condition=" '$(CI)' != 'true' AND '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))' != '' " />
55

66
<Import Project="version.props" />
7-
<Import Project="build\dependencies.props" />
8-
<Import Project="build\sources.props" />
97

108
<PropertyGroup>
119
<Product>Microsoft .NET Extensions</Product>
1210
<RepositoryUrl>https://github.com/aspnet/Extensions</RepositoryUrl>
1311
<RepositoryType>git</RepositoryType>
1412
<RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
15-
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
13+
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)eng\AspNetCore.snk</AssemblyOriginatorKeyFile>
1614
<SignAssembly>true</SignAssembly>
1715
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1816

1917
<ArtifactsDir>$(MSBuildThisFileDirectory)artifacts\</ArtifactsDir>
2018
<PackageOutputPath>$(MSBuildThisFileDirectory)artifacts\build\</PackageOutputPath>
19+
20+
<IsBenchmarkProject Condition="$(MSBuildProjectName.EndsWith('.Performance'))">true</IsBenchmarkProject>
21+
<IsTestProject Condition="$(MSBuildProjectName.EndsWith('Tests')) OR $(MSBuildProjectName.EndsWith('.Test'))">true</IsTestProject>
22+
<UseLatestPackageReferences Condition=" '$(PatchVersion)' == '0' OR '$(IsTestProject)' == 'true' OR '$(IsBenchmarkProject)' == 'true'">true</UseLatestPackageReferences>
23+
24+
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
25+
</PropertyGroup>
26+
27+
<PropertyGroup>
28+
<DeveloperBuildTestTfms>netcoreapp2.2</DeveloperBuildTestTfms>
29+
<StandardTestTfms>$(DeveloperBuildTestTfms)</StandardTestTfms>
30+
<StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(StandardTestTfms);net461</StandardTestTfms>
2131
</PropertyGroup>
2232

33+
<Import Project="eng\Baseline.props" />
34+
<Import Project="eng\Dependencies.props" />
35+
<Import Project="eng\PatchConfig.props" />
36+
<Import Project="eng\Sources.props" />
37+
38+
<ItemGroup>
39+
<PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
40+
</ItemGroup>
2341
</Project>

‎Directory.Build.targets

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@
33
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion>
44
<NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
55
</PropertyGroup>
6+
7+
<Import Project="eng\targets\Packaging.targets" Condition=" '$(MSBuildProjectExtension)' == '.csproj' " />
8+
<Import Project="eng\targets\ResolveReferences.targets" Condition=" '$(MSBuildProjectExtension)' == '.csproj' " />
69
</Project>

‎Extensions.sln

Lines changed: 248 additions & 126 deletions
Large diffs are not rendered by default.

‎build/dependencies.props

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎build/repo.props

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
<Project>
2-
<Import Project="dependencies.props" />
2+
<Import Project="..\eng\Dependencies.props" />
33

44
<PropertyGroup>
55
<EnableBenchmarkValidation>true</EnableBenchmarkValidation>
6+
<SkipArtifactVerification>true</SkipArtifactVerification>
7+
<DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
8+
<BuildSolutions>false</BuildSolutions>
9+
<SharedSourcesFolder>$(RepositoryRoot)src\Shared\src\</SharedSourcesFolder>
610
<SolutionProperties>$(SolutionProperties);DotNetPackageVersionPropsPath=$(DotNetPackageVersionPropsPath)</SolutionProperties>
711
<SolutionProperties>$(SolutionProperties);DotNetAdditionalRestoreSources=$(DotNetAdditionalRestoreSources)</SolutionProperties>
12+
<Projects>$(RepositoryRoot)src\**\*.csproj</Projects>
813
</PropertyGroup>
914

1015
<ItemGroup>
11-
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)"
12-
Feed="$(DotNetAssetRootUrl)"
13-
FeedCredential="$(DotNetAssetRootAccessTokenSuffix)" />
16+
<SharedSourceDirectories Include="$([System.IO.Directory]::GetDirectories($(SharedSourcesFolder)))" />
17+
</ItemGroup>
1418

19+
<ItemGroup>
1520
<DotNetCoreRuntime Include="$(MicrosoftNETCoreAppPackageVersion)"
1621
Feed="$(DotNetAssetRootUrl)"
1722
FeedCredential="$(DotNetAssetRootAccessTokenSuffix)" />

‎build/Key.snk renamed to ‎eng/AspNetCore.snk

File renamed without changes.

‎eng/Baseline.props

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<!-- Auto generated. Do not edit manually, use eng/tools/BaselineGenerator/ to recreate. -->
2+
<Project>
3+
<!-- Package: Microsoft.Extensions.DiagnosticAdapter-->
4+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.DiagnosticAdapter' ">
5+
<BaselinePackageVersion>2.1.0</BaselinePackageVersion>
6+
</PropertyGroup>
7+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.DiagnosticAdapter' AND '$(TargetFramework)' == 'net461' ">
8+
<BaselinePackageReference Include="System.Diagnostics.DiagnosticSource" Version="[4.5.0, )" />
9+
</ItemGroup>
10+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.DiagnosticAdapter' AND '$(TargetFramework)' == 'netcoreapp2.0' ">
11+
<BaselinePackageReference Include="System.Diagnostics.DiagnosticSource" Version="[4.5.0, )" />
12+
</ItemGroup>
13+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.DiagnosticAdapter' AND '$(TargetFramework)' == 'netstandard2.0' ">
14+
<BaselinePackageReference Include="System.Diagnostics.DiagnosticSource" Version="[4.5.0, )" />
15+
</ItemGroup>
16+
<!-- Package: Microsoft.Extensions.ObjectPool-->
17+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.ObjectPool' ">
18+
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
19+
</PropertyGroup>
20+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.ObjectPool' AND '$(TargetFramework)' == 'netstandard2.0' " />
21+
<!-- Package: Microsoft.Extensions.Primitives-->
22+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Primitives' ">
23+
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
24+
</PropertyGroup>
25+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Primitives' AND '$(TargetFramework)' == 'netstandard2.0' ">
26+
<BaselinePackageReference Include="System.Memory" Version="[4.5.1, )" />
27+
<BaselinePackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="[4.5.1, )" />
28+
</ItemGroup>
29+
</Project>

‎eng/Dependencies.props

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<Project>
2+
<PropertyGroup>
3+
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
4+
</PropertyGroup>
5+
6+
<!-- These package versions may be overridden or updated by automation. -->
7+
<PropertyGroup Label="Package Versions: Auto">
8+
<FSharpCorePackageVersion>4.2.1</FSharpCorePackageVersion>
9+
<InternalAspNetCoreSdkPackageVersion>2.2.0-preview2-20181019.5</InternalAspNetCoreSdkPackageVersion>
10+
<MicrosoftNETCoreAppPackageVersion>2.2.0-preview3-26927-02</MicrosoftNETCoreAppPackageVersion>
11+
<MicrosoftWin32RegistryPackageVersion>4.5.0</MicrosoftWin32RegistryPackageVersion>
12+
<NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
13+
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.0</SystemDiagnosticsDiagnosticSourcePackageVersion>
14+
<SystemIOPipelinesPackageVersion>4.5.2</SystemIOPipelinesPackageVersion>
15+
<SystemMemoryPackageVersion>4.5.1</SystemMemoryPackageVersion>
16+
<SystemNetHttpPackageVersion>4.3.2</SystemNetHttpPackageVersion>
17+
<SystemReflectionMetadataPackageVersion>1.6.0</SystemReflectionMetadataPackageVersion>
18+
<SystemRuntimeCompilerServicesUnsafePackageVersion>4.5.1</SystemRuntimeCompilerServicesUnsafePackageVersion>
19+
<SystemRuntimeInteropServicesRuntimeInformationPackageVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationPackageVersion>
20+
<SystemSecurityCryptographyCngPackageVersion>4.5.0</SystemSecurityCryptographyCngPackageVersion>
21+
<SystemThreadingTasksExtensionsPackageVersion>4.5.1</SystemThreadingTasksExtensionsPackageVersion>
22+
<SystemValueTuplePackageVersion>4.5.0</SystemValueTuplePackageVersion>
23+
</PropertyGroup>
24+
25+
<!-- This may import a generated file which may override the variables above. -->
26+
<Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
27+
28+
<ItemGroup Label=".NET Core dependencies">
29+
<LatestPackageReference Include="FSharp.Core" Version="$(FSharpCorePackageVersion)" />
30+
<LatestPackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
31+
<LatestPackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
32+
<LatestPackageReference Include="System.IO.Pipelines" Version="$(SystemIOPipelinesPackageVersion)" />
33+
<LatestPackageReference Include="System.Memory" Version="$(SystemMemoryPackageVersion)" />
34+
<LatestPackageReference Include="System.Net.Http" Version="$(SystemNetHttpPackageVersion)" />
35+
<LatestPackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataPackageVersion)" />
36+
<LatestPackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafePackageVersion)" />
37+
<LatestPackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="$(SystemRuntimeInteropServicesRuntimeInformationPackageVersion)" />
38+
<LatestPackageReference Include="System.Security.Cryptography.Cng" Version="$(SystemSecurityCryptographyCngPackageVersion)" />
39+
<LatestPackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsPackageVersion)" />
40+
<LatestPackageReference Include="System.ValueTuple" Version="$(SystemValueTuplePackageVersion)" />
41+
</ItemGroup>
42+
43+
<ItemGroup Label="External dependencies">
44+
<LatestPackageReference Include="BenchmarkDotNet" Version="0.10.13" />
45+
<LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.8.0" />
46+
<LatestPackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
47+
<LatestPackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
48+
<LatestPackageReference Include="Moq" Version="4.10.0" />
49+
<LatestPackageReference Include="Newtonsoft.Json" Version="11.0.2" />
50+
<LatestPackageReference Include="xunit.abstractions" Version="2.0.1" />
51+
<LatestPackageReference Include="xunit.analyzers" Version="0.10.0" />
52+
<LatestPackageReference Include="xunit.assert" Version="2.3.0" />
53+
<LatestPackageReference Include="xunit.extensibility.execution" Version="2.3.0" />
54+
<LatestPackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
55+
<LatestPackageReference Include="xunit" Version="2.4.0" />
56+
</ItemGroup>
57+
58+
<ItemGroup Condition=" '$(IsTestProject)' == 'true' ">
59+
<Reference Include="Microsoft.NET.Test.Sdk" />
60+
<Reference Include="Moq" />
61+
<Reference Include="xunit" />
62+
<Reference Include="xunit.analyzers" />
63+
<Reference Include="xunit.runner.visualstudio" />
64+
</ItemGroup>
65+
</Project>

‎eng/PatchConfig.props

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<Project>
2+
3+
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.6' ">
4+
<PackagesInPatch>
5+
Microsoft.Extensions.ObjectPool;
6+
Microsoft.Extensions.Primitives;
7+
</PackagesInPatch>
8+
</PropertyGroup>
9+
10+
</Project>

‎build/sources.props renamed to ‎eng/Sources.props

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,12 @@
33

44
<PropertyGroup Label="RestoreSources">
55
<RestoreSources>$(DotNetRestoreSources)</RestoreSources>
6-
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
6+
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' ">
77
$(RestoreSources);
8-
https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
98
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
109
https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
1110
https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
1211
https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
13-
</RestoreSources>
14-
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
15-
$(RestoreSources);
1612
https://api.nuget.org/v3/index.json;
1713
</RestoreSources>
1814
<RestoreSources Condition=" '$(DotNetAdditionalRestoreSources)' != '' ">

0 commit comments

Comments
 (0)