Skip to content

Commit c06eec1

Browse files
committed
Merge in 'release/2.2' changes
2 parents 48a7480 + 33d4255 commit c06eec1

27 files changed

+85
-288
lines changed

Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
<GoogleTestSubmoduleRoot>$(RepositoryRoot)src\submodules\googletest\</GoogleTestSubmoduleRoot>
8989

9090
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
91+
<DisableDeterministicSourceRoot Condition="'$(IsSampleProject)' == 'true' OR '$(IsTestAssetProject)' == 'true'">true</DisableDeterministicSourceRoot>
9192
</PropertyGroup>
9293

9394
<PropertyGroup>

build/buildorder.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" />
1111
<RepositoryBuildOrder Include="MvcPrecompilation" Order="15" RootPath="$(RepositoryRoot)src\MvcPrecompilation\" />
1212
<RepositoryBuildOrder Include="Scaffolding" Order="15" />
13-
<RepositoryBuildOrder Include="MusicStore" Order="16" RootPath="$(RepositoryRoot)src\MusicStore\" />
1413
<RepositoryBuildOrder Include="SignalR" Order="16" RootPath="$(RepositoryRoot)src\SignalR\" />
1514
<RepositoryBuildOrder Include="AuthSamples" Order="16" RootPath="$(RepositoryRoot)src\AuthSamples\" />
1615
<RepositoryBuildOrder Include="Templating" Order="17" RootPath="$(RepositoryRoot)src\Templating\" />

build/dependencies.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<MicrosoftAspNetCoreBuildToolsApiCheckPackageVersion>$(KoreBuildVersion)</MicrosoftAspNetCoreBuildToolsApiCheckPackageVersion>
3030
<InternalAspNetCoreSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSdkPackageVersion>
3131
<InternalAspNetCoreSiteExtensionSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSiteExtensionSdkPackageVersion>
32-
<InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">2.2.1-build-20181213.2</InternalAspNetCoreSdkPackageVersion>
32+
<InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">2.2.1-build-20190104.5</InternalAspNetCoreSdkPackageVersion>
3333
</PropertyGroup>
3434

3535
<!-- These are package versions that should not be overridden or updated by automation. -->

build/repo.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@
107107
$(RepositoryRoot)src\Razor\**\*.*proj;
108108
$(RepositoryRoot)src\Mvc\**\*.*proj;
109109
$(RepositoryRoot)src\Azure\**\*.*proj;
110+
$(RepositoryRoot)src\MusicStore\**\*.*proj;
110111
"
111112
Exclude="
112113
@(ProjectToExclude);

build/submodules.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242

4343
<!-- Test-only repos -->
4444
<Repository Include="AuthSamples" RootPath="$(RepositoryRoot)src\AuthSamples\" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
45-
<Repository Include="MusicStore" RootPath="$(RepositoryRoot)src\MusicStore\" PatchPolicy="AlwaysUpdateAndCascadeVersions" />
4645
</ItemGroup>
4746

4847
<ItemGroup>

eng/Dependencies.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ and are generated based on the last package release.
4242
<LatestPackageReference Include="Microsoft.Extensions.Caching.Redis" Version="$(MicrosoftExtensionsCachingRedisPackageVersion)" />
4343
<LatestPackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="$(MicrosoftExtensionsCachingSqlServerPackageVersion)" />
4444
<LatestPackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
45+
<LatestPackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(MicrosoftExtensionsConfigurationBinderPackageVersion)" />
4546
<LatestPackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
4647
<LatestPackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
4748
<LatestPackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MicrosoftExtensionsConfigurationFileExtensionsPackageVersion)" />

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"version": "2.2.100"
44
},
55
"msbuild-sdks": {
6-
"Internal.AspNetCore.Sdk": "2.2.1-build-20181213.2"
6+
"Internal.AspNetCore.Sdk": "2.2.1-build-20190104.5"
77
}
88
}

korebuild-lock.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version:2.2.1-build-20181213.2
2-
commithash:3a55c25b0b17b7ff51010d1b4dfe50a0295c0a4f
1+
version:2.2.1-build-20190104.5
2+
commithash:abf5766bd636c29b089ea2995ada30de00d563ff

src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
<None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
1515
</ItemGroup>
1616

17+
<Import Project="$(MvcTestingTargets)" Condition="'$(MvcTestingTargets)' != ''" />
18+
1719
<ItemGroup>
1820
<ProjectReference Include="..\..\testassets\Identity.DefaultUI.WebSite\Identity.DefaultUI.WebSite.csproj" />
1921

@@ -23,5 +25,4 @@
2325
<Reference Include="AngleSharp" />
2426
</ItemGroup>
2527

26-
<Import Project="$(MvcTestingTargets)" Condition="'$(MvcTestingTargets)' != ''" />
2728
</Project>

src/MusicStore/.gitignore

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

0 commit comments

Comments
 (0)