huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev' into namc/merge-rel-2.0.3

This commit is contained in:
Nate McMaster 2017-11-09 11:27:02 -08:00
parent 7ebdee8667 05a4775633
commit 3d88b10b73
8 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/artifacts.props
View File

@ -142,6 +142,7 @@
<PackageArtifact Include="Microsoft.AspNetCore.Sockets.Common.Http" Category="noship" /> <PackageArtifact Include="Microsoft.AspNetCore.Sockets.Common.Http" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.Sockets.Http" Category="noship" /> <PackageArtifact Include="Microsoft.AspNetCore.Sockets.Http" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.SpaServices" Category="ship" Metapackage="true" RuntimeStore="true"/> <PackageArtifact Include="Microsoft.AspNetCore.SpaServices" Category="ship" Metapackage="true" RuntimeStore="true"/>
<PackageArtifact Include="Microsoft.AspNetCore.SpaServices.Extensions" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.SpaTemplates" Category="ship" /> <PackageArtifact Include="Microsoft.AspNetCore.SpaTemplates" Category="ship" />
<PackageArtifact Include="Microsoft.AspNetCore.StaticFiles" Category="ship" Metapackage="true" RuntimeStore="true"/> <PackageArtifact Include="Microsoft.AspNetCore.StaticFiles" Category="ship" Metapackage="true" RuntimeStore="true"/>
<PackageArtifact Include="Microsoft.AspNetCore.TestHost" Category="ship" /> <PackageArtifact Include="Microsoft.AspNetCore.TestHost" Category="ship" />

2
build/dependencies.props
View File

@ -138,7 +138,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ExternalDependency Include="Microsoft.AspNetCore.AspNetCoreModule" Version="1.0.0-pre-10141" Source="$(AspNetCoreModuleFeed)" Private="true" Mirror="true" /> <ExternalDependency Include="Microsoft.AspNetCore.AspNetCoreModule" Version="1.0.0-pre-10196" Source="$(AspNetCoreModuleFeed)" Private="true" Mirror="true" />
</ItemGroup> </ItemGroup>
<!-- nuget.org --> <!-- nuget.org -->

6
build/repo.targets
View File

@ -179,6 +179,12 @@
SourceName="Artifacts" SourceName="Artifacts"
Condition="%(Repository.Build)" Condition="%(Repository.Build)"
SourceUri="$(BuildDir)" /> SourceUri="$(BuildDir)" />
<UpdatePackageSource
NuGetConfigPath="%(Repository.RootPath)NuGet.config"
SourceName="MirroredArtifacts"
Condition="%(Repository.Build)"
SourceUri="$(IntermediateMirrorPackageDir)" />
</Target> </Target>
<Target Name="SplitPackages"> <Target Name="SplitPackages">

2
modules/Common

@ -1 +1 @@
Subproject commit f08c6c3c588a621bef902a03e4eea88a287be28a Subproject commit 388c04ce5cb242865c432c481b23b85e14c7ce68

2
modules/EntityFrameworkCore

@ -1 +1 @@
Subproject commit c81d716cc27013d6ff5ca3eb5fa60cdbaa782bd3 Subproject commit 2197ef2c0dcc06fa162b0525d66757ad52e01257

2
modules/JavaScriptServices

@ -1 +1 @@
Subproject commit 7bf5516bb2c09f85fe6d5e5acacd9aad245ee2db Subproject commit 0c77224f46dd6a0f3d72352a5a44d0d6abee3e22

2
modules/Mvc

@ -1 +1 @@
Subproject commit d9825d1547e51619c0e4d6eba710c1f67172e136 Subproject commit bb07119b4ae3d5c8239187e0e4a50fd06d922440

13
scripts/UpdateRepos.ps1
View File

@ -72,10 +72,17 @@ try {
continue continue
} }
Write-Verbose "About to update dependencies.props for $($submodule.module)" $koreBuildLock = "korebuild-lock.txt"
& .\run.ps1 -Update upgrade deps --source $Source --id $LineupID --version $LineupVersion --deps-file $depsFile
Invoke-Block { & git @gitConfigArgs add $depsFile "korebuild-lock.txt" } $universeKoreBuildLock = (Join-Path $RepoRoot $koreBuildLock)
$submoduleKoreBuildLock = (Join-Path $submodule.path $koreBuildLock)
Copy-Item $universeKoreBuildLock $submoduleKoreBuildLock -Force
Write-Verbose "About to update dependencies.props for $($submodule.module)"
& .\run.ps1 upgrade deps --source $Source --id $LineupID --version $LineupVersion --deps-file $depsFile
Invoke-Block { & git @gitConfigArgs add $depsFile $koreBuildLock }
Invoke-Block { & git @gitConfigArgs commit --quiet -m "Update dependencies.props`n`n[auto-updated: dependencies]" @GitCommitArgs } Invoke-Block { & git @gitConfigArgs commit --quiet -m "Update dependencies.props`n`n[auto-updated: dependencies]" @GitCommitArgs }
$sshUrl = "git@github.com:aspnet/$($submodule.module)" $sshUrl = "git@github.com:aspnet/$($submodule.module)"