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

Update to .NET Core 2.2.0-preview1-26425-02

This commit is contained in:
Nate McMaster 2018-04-25 08:46:39 -07:00
parent f7bca0b090
commit a375ac31a4
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
2 changed files with 44 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
build/dependencies.props
View File

@ -1,36 +1,36 @@
<Project> <Project>
<!-- These package version may be overridden or updated by automation. --> <!-- These package version may be overridden or updated by automation. -->
<PropertyGroup Label="Package Versions: Auto" Condition=" '$(DotNetPackageVersionPropsPath)' == '' "> <PropertyGroup Label="Package Versions: Auto" Condition=" '$(DotNetPackageVersionPropsPath)' == '' ">
<MicrosoftCSharpPackageVersion>4.5.0-preview3-26423-04</MicrosoftCSharpPackageVersion> <MicrosoftCSharpPackageVersion>4.5.0-preview3-26424-05</MicrosoftCSharpPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>2.2.0-preview1-26424-04</MicrosoftExtensionsDependencyModelPackageVersion> <MicrosoftExtensionsDependencyModelPackageVersion>2.2.0-preview1-26425-02</MicrosoftExtensionsDependencyModelPackageVersion>
<!-- MicrosoftNETCoreApp21PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. --> <!-- MicrosoftNETCoreApp21PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. -->
<MicrosoftNETCoreAppPackageVersion>2.2.0-preview1-26424-04</MicrosoftNETCoreAppPackageVersion> <MicrosoftNETCoreAppPackageVersion>2.2.0-preview1-26425-02</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetAppHostPackageVersion>2.2.0-preview1-26424-04</MicrosoftNETCoreDotNetAppHostPackageVersion> <MicrosoftNETCoreDotNetAppHostPackageVersion>2.2.0-preview1-26425-02</MicrosoftNETCoreDotNetAppHostPackageVersion>
<MicrosoftWin32RegistryPackageVersion>4.5.0-preview3-26423-04</MicrosoftWin32RegistryPackageVersion> <MicrosoftWin32RegistryPackageVersion>4.5.0-preview3-26424-05</MicrosoftWin32RegistryPackageVersion>
<NuGetFrameworksPackageVersion>4.8.0-preview1.5116</NuGetFrameworksPackageVersion> <NuGetFrameworksPackageVersion>4.8.0-preview1.5116</NuGetFrameworksPackageVersion>
<SystemBuffersPackageVersion>4.5.0-preview3-26423-04</SystemBuffersPackageVersion> <SystemBuffersPackageVersion>4.5.0-preview3-26424-05</SystemBuffersPackageVersion>
<SystemCollectionsImmutablePackageVersion>1.5.0-preview3-26423-04</SystemCollectionsImmutablePackageVersion> <SystemCollectionsImmutablePackageVersion>1.5.0-preview3-26424-05</SystemCollectionsImmutablePackageVersion>
<SystemComponentModelAnnotationsPackageVersion>4.5.0-preview3-26423-04</SystemComponentModelAnnotationsPackageVersion> <SystemComponentModelAnnotationsPackageVersion>4.5.0-preview3-26424-05</SystemComponentModelAnnotationsPackageVersion>
<SystemDataSqlClientPackageVersion>4.5.0-preview3-26423-04</SystemDataSqlClientPackageVersion> <SystemDataSqlClientPackageVersion>4.5.0-preview3-26424-05</SystemDataSqlClientPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.0-preview3-26423-04</SystemDiagnosticsDiagnosticSourcePackageVersion> <SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.0-preview3-26424-05</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemDiagnosticsEventLogPackageVersion>4.5.0-preview3-26423-04</SystemDiagnosticsEventLogPackageVersion> <SystemDiagnosticsEventLogPackageVersion>4.5.0-preview3-26424-05</SystemDiagnosticsEventLogPackageVersion>
<SystemIOPipelinesPackageVersion>4.5.0-preview3-26423-04</SystemIOPipelinesPackageVersion> <SystemIOPipelinesPackageVersion>4.5.0-preview3-26424-05</SystemIOPipelinesPackageVersion>
<SystemMemoryPackageVersion>4.5.0-preview3-26423-04</SystemMemoryPackageVersion> <SystemMemoryPackageVersion>4.5.0-preview3-26424-05</SystemMemoryPackageVersion>
<SystemNetHttpWinHttpHandlerPackageVersion>4.5.0-preview3-26423-04</SystemNetHttpWinHttpHandlerPackageVersion> <SystemNetHttpWinHttpHandlerPackageVersion>4.5.0-preview3-26424-05</SystemNetHttpWinHttpHandlerPackageVersion>
<SystemNetWebSocketsWebSocketProtocolPackageVersion>4.5.0-preview3-26423-04</SystemNetWebSocketsWebSocketProtocolPackageVersion> <SystemNetWebSocketsWebSocketProtocolPackageVersion>4.5.0-preview3-26424-05</SystemNetWebSocketsWebSocketProtocolPackageVersion>
<SystemNumericsVectorsPackageVersion>4.5.0-preview3-26423-04</SystemNumericsVectorsPackageVersion> <SystemNumericsVectorsPackageVersion>4.5.0-preview3-26424-05</SystemNumericsVectorsPackageVersion>
<SystemReflectionMetadataPackageVersion>1.6.0-preview3-26423-04</SystemReflectionMetadataPackageVersion> <SystemReflectionMetadataPackageVersion>1.6.0-preview3-26424-05</SystemReflectionMetadataPackageVersion>
<SystemRuntimeCompilerServicesUnsafePackageVersion>4.5.0-preview3-26423-04</SystemRuntimeCompilerServicesUnsafePackageVersion> <SystemRuntimeCompilerServicesUnsafePackageVersion>4.5.0-preview3-26424-05</SystemRuntimeCompilerServicesUnsafePackageVersion>
<SystemSecurityCryptographyCngPackageVersion>4.5.0-preview3-26423-04</SystemSecurityCryptographyCngPackageVersion> <SystemSecurityCryptographyCngPackageVersion>4.5.0-preview3-26424-05</SystemSecurityCryptographyCngPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>4.5.0-preview3-26423-04</SystemSecurityCryptographyXmlPackageVersion> <SystemSecurityCryptographyXmlPackageVersion>4.5.0-preview3-26424-05</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>4.5.0-preview3-26423-04</SystemSecurityPermissionsPackageVersion> <SystemSecurityPermissionsPackageVersion>4.5.0-preview3-26424-05</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>4.5.0-preview3-26423-04</SystemSecurityPrincipalWindowsPackageVersion> <SystemSecurityPrincipalWindowsPackageVersion>4.5.0-preview3-26424-05</SystemSecurityPrincipalWindowsPackageVersion>
<SystemServiceProcessServiceControllerPackageVersion>4.5.0-preview3-26423-04</SystemServiceProcessServiceControllerPackageVersion> <SystemServiceProcessServiceControllerPackageVersion>4.5.0-preview3-26424-05</SystemServiceProcessServiceControllerPackageVersion>
<SystemTextEncodingsWebPackageVersion>4.5.0-preview3-26423-04</SystemTextEncodingsWebPackageVersion> <SystemTextEncodingsWebPackageVersion>4.5.0-preview3-26424-05</SystemTextEncodingsWebPackageVersion>
<SystemThreadingChannelsPackageVersion>4.5.0-preview3-26423-04</SystemThreadingChannelsPackageVersion> <SystemThreadingChannelsPackageVersion>4.5.0-preview3-26424-05</SystemThreadingChannelsPackageVersion>
<SystemThreadingTasksDataflowPackageVersion>4.9.0-preview3-26423-04</SystemThreadingTasksDataflowPackageVersion> <SystemThreadingTasksDataflowPackageVersion>4.9.0-preview3-26424-05</SystemThreadingTasksDataflowPackageVersion>
<SystemThreadingTasksExtensionsPackageVersion>4.5.0-preview3-26423-04</SystemThreadingTasksExtensionsPackageVersion> <SystemThreadingTasksExtensionsPackageVersion>4.5.0-preview3-26424-05</SystemThreadingTasksExtensionsPackageVersion>
<SystemValueTuplePackageVersion>4.5.0-preview3-26423-04</SystemValueTuplePackageVersion> <SystemValueTuplePackageVersion>4.5.0-preview3-26424-05</SystemValueTuplePackageVersion>
</PropertyGroup> </PropertyGroup>
<Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" /> <Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />

24
scripts/UpdateDependenciesCoreFx.ps1
View File

@ -1,6 +1,7 @@
[CmdletBinding()] [CmdletBinding()]
param( param(
[switch]$NoCommit,
[string]$GithubEmail, [string]$GithubEmail,
[string]$GithubUsername, [string]$GithubUsername,
[string]$GithubToken [string]$GithubToken
@ -106,20 +107,27 @@ $depsPath = Resolve-Path "$PSScriptRoot/../build/dependencies.props"
Write-Host "Loading deps from $depsPath" Write-Host "Loading deps from $depsPath"
[xml] $dependencies = LoadXml $depsPath [xml] $dependencies = LoadXml $depsPath
$baseBranch = "dev" if (-not $NoCommit) {
$baseBranch = "dev"
$currentBranch = Invoke-Block { & git rev-parse --abbrev-ref HEAD } $currentBranch = Invoke-Block { & git rev-parse --abbrev-ref HEAD }
$destinationBranch = "rybrande/UpgradeDepsTest" $destinationBranch = "rybrande/UpgradeDepsTest"
Invoke-Block { & git checkout -tb $destinationBranch "origin/$baseBranch" }
}
Invoke-Block { & git checkout -tb $destinationBranch "origin/$baseBranch" }
try { try {
$updatedVars = UpdateVersions $variables $dependencies $depsPath $updatedVars = UpdateVersions $variables $dependencies $depsPath
$body = CommitUpdatedVersions $updatedVars $dependencies $depsPath if (-not $NoCommit) {
$body = CommitUpdatedVersions $updatedVars $dependencies $depsPath
if ($body) { if ($body) {
CreatePR "aspnet" $GithubUsername $baseBranch $destinationBranch $body $GithubToken CreatePR "aspnet" $GithubUsername $baseBranch $destinationBranch $body $GithubToken
}
} }
} }
finally { finally {
Invoke-Block { & git checkout $currentBranch } if (-not $NoCommit) {
Invoke-Block { & git checkout $currentBranch }
}
} }