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

Merge pull request #1003 from aspnet/prkrishn/merge2.1 

Prkrishn/merge2.1
This commit is contained in:
Pranav K 2018-03-27 14:51:20 -07:00 committed by GitHub
parent d877403d90 3fe479ab83
commit 613f63a158
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 88 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

167
build/dependencies.props
View File

@ -1,90 +1,90 @@
<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-preview2-26313-01</MicrosoftCSharpPackageVersion> <MicrosoftCSharpPackageVersion>4.5.0-preview2-26325-02</MicrosoftCSharpPackageVersion>
<MicrosoftDotNetPlatformAbstractionsPackageVersion>2.1.0-preview2-26313-01</MicrosoftDotNetPlatformAbstractionsPackageVersion> <MicrosoftDotNetPlatformAbstractionsPackageVersion>2.1.0-preview2-26325-03</MicrosoftDotNetPlatformAbstractionsPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>2.1.0-preview2-26313-01</MicrosoftExtensionsDependencyModelPackageVersion> <MicrosoftExtensionsDependencyModelPackageVersion>2.1.0-preview2-26325-03</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.1.0-preview2-26314-02</MicrosoftNETCoreAppPackageVersion> <MicrosoftNETCoreAppPackageVersion>2.1.0-preview2-26325-03</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview2-26314-02</MicrosoftNETCoreDotNetAppHostPackageVersion> <MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview2-26325-03</MicrosoftNETCoreDotNetAppHostPackageVersion>
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview2-26314-02</MicrosoftNETCoreDotNetHostPolicyPackageVersion> <MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview2-26325-03</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>2.1.0-preview2-26314-02</MicrosoftNETCoreDotNetHostResolverPackageVersion> <MicrosoftNETCoreDotNetHostResolverPackageVersion>2.1.0-preview2-26325-03</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>2.1.0-preview2-26313-01</MicrosoftNETCorePlatformsPackageVersion> <MicrosoftNETCorePlatformsPackageVersion>2.1.0-preview2-26325-02</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32RegistryPackageVersion>4.5.0-preview2-26313-01</MicrosoftWin32RegistryPackageVersion> <MicrosoftWin32RegistryPackageVersion>4.5.0-preview2-26325-02</MicrosoftWin32RegistryPackageVersion>
<NuGetFrameworksPackageVersion>4.7.0-preview1-4958</NuGetFrameworksPackageVersion> <NuGetFrameworksPackageVersion>4.7.0-netcore.2.1.preview2.5133</NuGetFrameworksPackageVersion>
<RuntimeAlpine36X64MicrosoftNETCoreAppPackageVersion>2.1.0-preview2-26314-02</RuntimeAlpine36X64MicrosoftNETCoreAppPackageVersion> <RuntimeAlpine36X64MicrosoftNETCoreAppPackageVersion>2.1.0-preview2-26325-03</RuntimeAlpine36X64MicrosoftNETCoreAppPackageVersion>
<RuntimeAlpine36X64MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview2-26314-02</RuntimeAlpine36X64MicrosoftNETCoreDotNetAppHostPackageVersion> <RuntimeAlpine36X64MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview2-26325-03</RuntimeAlpine36X64MicrosoftNETCoreDotNetAppHostPackageVersion>
<RuntimeAlpine36X64MicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview2-26314-02</RuntimeAlpine36X64MicrosoftNETCoreDotNetHostPackageVersion> <RuntimeAlpine36X64MicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview2-26325-03</RuntimeAlpine36X64MicrosoftNETCoreDotNetHostPackageVersion>
<RuntimeAlpine36X64MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview2-26314-02</RuntimeAlpine36X64MicrosoftNETCoreDotNetHostPolicyPackageVersion> <RuntimeAlpine36X64MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview2-26325-03</RuntimeAlpine36X64MicrosoftNETCoreDotNetHostPolicyPackageVersion>
<RuntimeAlpine36X64MicrosoftNETCoreDotNetHostResolverPackageVersion>2.1.0-preview2-26314-02</RuntimeAlpine36X64MicrosoftNETCoreDotNetHostResolverPackageVersion> <RuntimeAlpine36X64MicrosoftNETCoreDotNetHostResolverPackageVersion>2.1.0-preview2-26325-03</RuntimeAlpine36X64MicrosoftNETCoreDotNetHostResolverPackageVersion>
<RuntimeLinuxArmMicrosoftNETCoreAppPackageVersion>2.1.0-preview2-26314-02</RuntimeLinuxArmMicrosoftNETCoreAppPackageVersion> <RuntimeLinuxArmMicrosoftNETCoreAppPackageVersion>2.1.0-preview2-26325-03</RuntimeLinuxArmMicrosoftNETCoreAppPackageVersion>
<RuntimeLinuxArmMicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview2-26314-02</RuntimeLinuxArmMicrosoftNETCoreDotNetAppHostPackageVersion> <RuntimeLinuxArmMicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview2-26325-03</RuntimeLinuxArmMicrosoftNETCoreDotNetAppHostPackageVersion>
<RuntimeLinuxArmMicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview2-26314-02</RuntimeLinuxArmMicrosoftNETCoreDotNetHostPackageVersion> <RuntimeLinuxArmMicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview2-26325-03</RuntimeLinuxArmMicrosoftNETCoreDotNetHostPackageVersion>
<RuntimeLinuxArmMicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview2-26314-02</RuntimeLinuxArmMicrosoftNETCoreDotNetHostPolicyPackageVersion> <RuntimeLinuxArmMicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview2-26325-03</RuntimeLinuxArmMicrosoftNETCoreDotNetHostPolicyPackageVersion>
<RuntimeLinuxArmMicrosoftNETCoreDotNetHostResolverPackageVersion>2.1.0-preview2-26314-02</RuntimeLinuxArmMicrosoftNETCoreDotNetHostResolverPackageVersion> <RuntimeLinuxArmMicrosoftNETCoreDotNetHostResolverPackageVersion>2.1.0-preview2-26325-03</RuntimeLinuxArmMicrosoftNETCoreDotNetHostResolverPackageVersion>
<RuntimeLinuxX64MicrosoftNETCoreAppPackageVersion>2.1.0-preview2-26314-02</RuntimeLinuxX64MicrosoftNETCoreAppPackageVersion> <RuntimeLinuxX64MicrosoftNETCoreAppPackageVersion>2.1.0-preview2-26325-03</RuntimeLinuxX64MicrosoftNETCoreAppPackageVersion>
<RuntimeLinuxX64MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview2-26314-02</RuntimeLinuxX64MicrosoftNETCoreDotNetAppHostPackageVersion> <RuntimeLinuxX64MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview2-26325-03</RuntimeLinuxX64MicrosoftNETCoreDotNetAppHostPackageVersion>
<RuntimeLinuxX64MicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview2-26314-02</RuntimeLinuxX64MicrosoftNETCoreDotNetHostPackageVersion> <RuntimeLinuxX64MicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview2-26325-03</RuntimeLinuxX64MicrosoftNETCoreDotNetHostPackageVersion>
<RuntimeLinuxX64MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview2-26314-02</RuntimeLinuxX64MicrosoftNETCoreDotNetHostPolicyPackageVersion> <RuntimeLinuxX64MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview2-26325-03</RuntimeLinuxX64MicrosoftNETCoreDotNetHostPolicyPackageVersion>
<RuntimeLinuxX64MicrosoftNETCoreDotNetHostResolverPackageVersion>2.1.0-preview2-26314-02</RuntimeLinuxX64MicrosoftNETCoreDotNetHostResolverPackageVersion> <RuntimeLinuxX64MicrosoftNETCoreDotNetHostResolverPackageVersion>2.1.0-preview2-26325-03</RuntimeLinuxX64MicrosoftNETCoreDotNetHostResolverPackageVersion>
<RuntimeOsxX64MicrosoftNETCoreAppPackageVersion>2.1.0-preview2-26314-02</RuntimeOsxX64MicrosoftNETCoreAppPackageVersion> <RuntimeOsxX64MicrosoftNETCoreAppPackageVersion>2.1.0-preview2-26325-03</RuntimeOsxX64MicrosoftNETCoreAppPackageVersion>
<RuntimeOsxX64MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview2-26314-02</RuntimeOsxX64MicrosoftNETCoreDotNetAppHostPackageVersion> <RuntimeOsxX64MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview2-26325-03</RuntimeOsxX64MicrosoftNETCoreDotNetAppHostPackageVersion>
<RuntimeOsxX64MicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview2-26314-02</RuntimeOsxX64MicrosoftNETCoreDotNetHostPackageVersion> <RuntimeOsxX64MicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview2-26325-03</RuntimeOsxX64MicrosoftNETCoreDotNetHostPackageVersion>
<RuntimeOsxX64MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview2-26314-02</RuntimeOsxX64MicrosoftNETCoreDotNetHostPolicyPackageVersion> <RuntimeOsxX64MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview2-26325-03</RuntimeOsxX64MicrosoftNETCoreDotNetHostPolicyPackageVersion>
<RuntimeOsxX64MicrosoftNETCoreDotNetHostResolverPackageVersion>2.1.0-preview2-26314-02</RuntimeOsxX64MicrosoftNETCoreDotNetHostResolverPackageVersion> <RuntimeOsxX64MicrosoftNETCoreDotNetHostResolverPackageVersion>2.1.0-preview2-26325-03</RuntimeOsxX64MicrosoftNETCoreDotNetHostResolverPackageVersion>
<RuntimeWinX64MicrosoftNETCoreAppPackageVersion>2.1.0-preview2-26314-02</RuntimeWinX64MicrosoftNETCoreAppPackageVersion> <RuntimeWinX64MicrosoftNETCoreAppPackageVersion>2.1.0-preview2-26325-03</RuntimeWinX64MicrosoftNETCoreAppPackageVersion>
<RuntimeWinX64MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview2-26314-02</RuntimeWinX64MicrosoftNETCoreDotNetAppHostPackageVersion> <RuntimeWinX64MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview2-26325-03</RuntimeWinX64MicrosoftNETCoreDotNetAppHostPackageVersion>
<RuntimeWinX64MicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview2-26314-02</RuntimeWinX64MicrosoftNETCoreDotNetHostPackageVersion> <RuntimeWinX64MicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview2-26325-03</RuntimeWinX64MicrosoftNETCoreDotNetHostPackageVersion>
<RuntimeWinX64MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview2-26314-02</RuntimeWinX64MicrosoftNETCoreDotNetHostPolicyPackageVersion> <RuntimeWinX64MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview2-26325-03</RuntimeWinX64MicrosoftNETCoreDotNetHostPolicyPackageVersion>
<RuntimeWinX64MicrosoftNETCoreDotNetHostResolverPackageVersion>2.1.0-preview2-26314-02</RuntimeWinX64MicrosoftNETCoreDotNetHostResolverPackageVersion> <RuntimeWinX64MicrosoftNETCoreDotNetHostResolverPackageVersion>2.1.0-preview2-26325-03</RuntimeWinX64MicrosoftNETCoreDotNetHostResolverPackageVersion>
<RuntimeWinX86MicrosoftNETCoreAppPackageVersion>2.1.0-preview2-26314-02</RuntimeWinX86MicrosoftNETCoreAppPackageVersion> <RuntimeWinX86MicrosoftNETCoreAppPackageVersion>2.1.0-preview2-26325-03</RuntimeWinX86MicrosoftNETCoreAppPackageVersion>
<RuntimeWinX86MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview2-26314-02</RuntimeWinX86MicrosoftNETCoreDotNetAppHostPackageVersion> <RuntimeWinX86MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0-preview2-26325-03</RuntimeWinX86MicrosoftNETCoreDotNetAppHostPackageVersion>
<RuntimeWinX86MicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview2-26314-02</RuntimeWinX86MicrosoftNETCoreDotNetHostPackageVersion> <RuntimeWinX86MicrosoftNETCoreDotNetHostPackageVersion>2.1.0-preview2-26325-03</RuntimeWinX86MicrosoftNETCoreDotNetHostPackageVersion>
<RuntimeWinX86MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview2-26314-02</RuntimeWinX86MicrosoftNETCoreDotNetHostPolicyPackageVersion> <RuntimeWinX86MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-preview2-26325-03</RuntimeWinX86MicrosoftNETCoreDotNetHostPolicyPackageVersion>
<RuntimeWinX86MicrosoftNETCoreDotNetHostResolverPackageVersion>2.1.0-preview2-26314-02</RuntimeWinX86MicrosoftNETCoreDotNetHostResolverPackageVersion> <RuntimeWinX86MicrosoftNETCoreDotNetHostResolverPackageVersion>2.1.0-preview2-26325-03</RuntimeWinX86MicrosoftNETCoreDotNetHostResolverPackageVersion>
<SystemBuffersPackageVersion>4.5.0-preview2-26313-01</SystemBuffersPackageVersion> <SystemBuffersPackageVersion>4.5.0-preview2-26325-02</SystemBuffersPackageVersion>
<SystemCodeDomPackageVersion>4.5.0-preview2-26313-01</SystemCodeDomPackageVersion> <SystemCodeDomPackageVersion>4.5.0-preview2-26325-02</SystemCodeDomPackageVersion>
<SystemCollectionsImmutablePackageVersion>1.5.0-preview2-26313-01</SystemCollectionsImmutablePackageVersion> <SystemCollectionsImmutablePackageVersion>1.5.0-preview2-26325-02</SystemCollectionsImmutablePackageVersion>
<SystemComponentModelAnnotationsPackageVersion>4.5.0-preview2-26313-01</SystemComponentModelAnnotationsPackageVersion> <SystemComponentModelAnnotationsPackageVersion>4.5.0-preview2-26325-02</SystemComponentModelAnnotationsPackageVersion>
<SystemCompositionAttributedModelPackageVersion>1.6.0-preview2-26313-01</SystemCompositionAttributedModelPackageVersion> <SystemCompositionAttributedModelPackageVersion>1.2.0-preview2-26325-02</SystemCompositionAttributedModelPackageVersion>
<SystemCompositionConventionPackageVersion>1.6.0-preview2-26313-01</SystemCompositionConventionPackageVersion> <SystemCompositionConventionPackageVersion>1.2.0-preview2-26325-02</SystemCompositionConventionPackageVersion>
<SystemCompositionHostingPackageVersion>1.6.0-preview2-26313-01</SystemCompositionHostingPackageVersion> <SystemCompositionHostingPackageVersion>1.2.0-preview2-26325-02</SystemCompositionHostingPackageVersion>
<SystemCompositionPackageVersion>1.6.0-preview2-26313-01</SystemCompositionPackageVersion> <SystemCompositionPackageVersion>1.2.0-preview2-26325-02</SystemCompositionPackageVersion>
<SystemCompositionRuntimePackageVersion>1.6.0-preview2-26313-01</SystemCompositionRuntimePackageVersion> <SystemCompositionRuntimePackageVersion>1.2.0-preview2-26325-02</SystemCompositionRuntimePackageVersion>
<SystemCompositionTypedPartsPackageVersion>1.6.0-preview2-26313-01</SystemCompositionTypedPartsPackageVersion> <SystemCompositionTypedPartsPackageVersion>1.2.0-preview2-26325-02</SystemCompositionTypedPartsPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>4.5.0-preview2-26313-01</SystemConfigurationConfigurationManagerPackageVersion> <SystemConfigurationConfigurationManagerPackageVersion>4.5.0-preview2-26325-02</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDataSqlClientPackageVersion>4.5.0-preview2-26313-01</SystemDataSqlClientPackageVersion> <SystemDataSqlClientPackageVersion>4.5.0-preview2-26325-02</SystemDataSqlClientPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.0-preview2-26313-01</SystemDiagnosticsDiagnosticSourcePackageVersion> <SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.0-preview2-26325-02</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemDiagnosticsEventLogPackageVersion>4.5.0-preview2-26313-01</SystemDiagnosticsEventLogPackageVersion> <SystemDiagnosticsEventLogPackageVersion>4.5.0-preview2-26325-02</SystemDiagnosticsEventLogPackageVersion>
<SystemIOFileSystemAccessControlPackageVersion>4.5.0-preview2-26313-01</SystemIOFileSystemAccessControlPackageVersion> <SystemIOFileSystemAccessControlPackageVersion>4.5.0-preview2-26325-02</SystemIOFileSystemAccessControlPackageVersion>
<SystemIOPackagingPackageVersion>4.5.0-preview2-26313-01</SystemIOPackagingPackageVersion> <SystemIOPackagingPackageVersion>4.5.0-preview2-26325-02</SystemIOPackagingPackageVersion>
<SystemIOPipesAccessControlPackageVersion>4.5.0-preview2-26313-01</SystemIOPipesAccessControlPackageVersion> <SystemIOPipesAccessControlPackageVersion>4.5.0-preview2-26325-02</SystemIOPipesAccessControlPackageVersion>
<SystemIOPipelinesPackageVersion>4.5.0-preview2-26313-01</SystemIOPipelinesPackageVersion> <SystemIOPipelinesPackageVersion>4.5.0-preview2-26325-02</SystemIOPipelinesPackageVersion>
<SystemIOPortsPackageVersion>4.5.0-preview2-26313-01</SystemIOPortsPackageVersion> <SystemIOPortsPackageVersion>4.5.0-preview2-26325-02</SystemIOPortsPackageVersion>
<SystemJsonPackageVersion>4.5.0-preview2-26313-01</SystemJsonPackageVersion> <SystemJsonPackageVersion>4.5.0-preview2-26325-02</SystemJsonPackageVersion>
<SystemMemoryPackageVersion>4.5.0-preview2-26313-01</SystemMemoryPackageVersion> <SystemMemoryPackageVersion>4.5.0-preview2-26325-02</SystemMemoryPackageVersion>
<SystemNetHttpWinHttpHandlerPackageVersion>4.5.0-preview2-26313-01</SystemNetHttpWinHttpHandlerPackageVersion> <SystemNetHttpWinHttpHandlerPackageVersion>4.5.0-preview2-26325-02</SystemNetHttpWinHttpHandlerPackageVersion>
<SystemNetWebSocketsWebSocketProtocolPackageVersion>4.5.0-preview2-26313-01</SystemNetWebSocketsWebSocketProtocolPackageVersion> <SystemNetWebSocketsWebSocketProtocolPackageVersion>4.5.0-preview2-26325-02</SystemNetWebSocketsWebSocketProtocolPackageVersion>
<SystemNumericsVectorsPackageVersion>4.5.0-preview2-26313-01</SystemNumericsVectorsPackageVersion> <SystemNumericsVectorsPackageVersion>4.5.0-preview2-26325-02</SystemNumericsVectorsPackageVersion>
<SystemReflectionDispatchProxyPackageVersion>4.5.0-preview2-26313-01</SystemReflectionDispatchProxyPackageVersion> <SystemReflectionDispatchProxyPackageVersion>4.5.0-preview2-26325-02</SystemReflectionDispatchProxyPackageVersion>
<SystemReflectionMetadataPackageVersion>1.6.0-preview2-26313-01</SystemReflectionMetadataPackageVersion> <SystemReflectionMetadataPackageVersion>1.6.0-preview2-26325-02</SystemReflectionMetadataPackageVersion>
<SystemReflectionTypeExtensionsPackageVersion>4.5.0-preview2-26313-01</SystemReflectionTypeExtensionsPackageVersion> <SystemReflectionTypeExtensionsPackageVersion>4.5.0-preview2-26325-02</SystemReflectionTypeExtensionsPackageVersion>
<SystemRuntimeCompilerServicesUnsafePackageVersion>4.5.0-preview2-26313-01</SystemRuntimeCompilerServicesUnsafePackageVersion> <SystemRuntimeCompilerServicesUnsafePackageVersion>4.5.0-preview2-26325-02</SystemRuntimeCompilerServicesUnsafePackageVersion>
<SystemSecurityAccessControlPackageVersion>4.5.0-preview2-26313-01</SystemSecurityAccessControlPackageVersion> <SystemSecurityAccessControlPackageVersion>4.5.0-preview2-26325-02</SystemSecurityAccessControlPackageVersion>
<SystemSecurityCryptographyCngPackageVersion>4.5.0-preview2-26313-01</SystemSecurityCryptographyCngPackageVersion> <SystemSecurityCryptographyCngPackageVersion>4.5.0-preview2-26325-02</SystemSecurityCryptographyCngPackageVersion>
<SystemSecurityCryptographyPkcsPackageVersion>4.5.0-preview2-26313-01</SystemSecurityCryptographyPkcsPackageVersion> <SystemSecurityCryptographyPkcsPackageVersion>4.5.0-preview2-26325-02</SystemSecurityCryptographyPkcsPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>4.5.0-preview2-26313-01</SystemSecurityCryptographyProtectedDataPackageVersion> <SystemSecurityCryptographyProtectedDataPackageVersion>4.5.0-preview2-26325-02</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>4.5.0-preview2-26313-01</SystemSecurityCryptographyXmlPackageVersion> <SystemSecurityCryptographyXmlPackageVersion>4.5.0-preview2-26325-02</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>4.5.0-preview2-26313-01</SystemSecurityPermissionsPackageVersion> <SystemSecurityPermissionsPackageVersion>4.5.0-preview2-26325-02</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>4.5.0-preview2-26313-01</SystemSecurityPrincipalWindowsPackageVersion> <SystemSecurityPrincipalWindowsPackageVersion>4.5.0-preview2-26325-02</SystemSecurityPrincipalWindowsPackageVersion>
<SystemServiceProcessServiceControllerPackageVersion>4.5.0-preview2-26313-01</SystemServiceProcessServiceControllerPackageVersion> <SystemServiceProcessServiceControllerPackageVersion>4.5.0-preview2-26325-02</SystemServiceProcessServiceControllerPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>4.5.0-preview2-26313-01</SystemTextEncodingCodePagesPackageVersion> <SystemTextEncodingCodePagesPackageVersion>4.5.0-preview2-26325-02</SystemTextEncodingCodePagesPackageVersion>
<SystemTextEncodingsWebPackageVersion>4.5.0-preview2-26313-01</SystemTextEncodingsWebPackageVersion> <SystemTextEncodingsWebPackageVersion>4.5.0-preview2-26325-02</SystemTextEncodingsWebPackageVersion>
<SystemThreadingAccessControlPackageVersion>4.5.0-preview2-26313-01</SystemThreadingAccessControlPackageVersion> <SystemThreadingAccessControlPackageVersion>4.5.0-preview2-26325-02</SystemThreadingAccessControlPackageVersion>
<SystemThreadingChannelsPackageVersion>4.5.0-preview2-26313-01</SystemThreadingChannelsPackageVersion> <SystemThreadingChannelsPackageVersion>4.5.0-preview2-26325-02</SystemThreadingChannelsPackageVersion>
<SystemThreadingTasksDataflowPackageVersion>4.9.0-preview2-26313-01</SystemThreadingTasksDataflowPackageVersion> <SystemThreadingTasksDataflowPackageVersion>4.9.0-preview2-26325-02</SystemThreadingTasksDataflowPackageVersion>
<SystemThreadingTasksExtensionsPackageVersion>4.5.0-preview2-26313-01</SystemThreadingTasksExtensionsPackageVersion> <SystemThreadingTasksExtensionsPackageVersion>4.5.0-preview2-26325-02</SystemThreadingTasksExtensionsPackageVersion>
<SystemValueTuplePackageVersion>4.5.0-preview2-26313-01</SystemValueTuplePackageVersion> <SystemValueTuplePackageVersion>4.5.0-preview2-26325-02</SystemValueTuplePackageVersion>
</PropertyGroup> </PropertyGroup>
<Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" /> <Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
@ -134,6 +134,7 @@
<MicrosoftCodeAnalysisVisualBasicPackageVersion>2.6.1</MicrosoftCodeAnalysisVisualBasicPackageVersion> <MicrosoftCodeAnalysisVisualBasicPackageVersion>2.6.1</MicrosoftCodeAnalysisVisualBasicPackageVersion>
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>2.6.1</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion> <MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>2.6.1</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>2.6.1</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion> <MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>2.6.1</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
<MicrosoftDiaSymReaderNativePackageVersion>1.7.0</MicrosoftDiaSymReaderNativePackageVersion>
<MicrosoftDotNetArchivePackageVersion>0.2.0-beta-62606-02</MicrosoftDotNetArchivePackageVersion> <MicrosoftDotNetArchivePackageVersion>0.2.0-beta-62606-02</MicrosoftDotNetArchivePackageVersion>
<MicrosoftDotNetProjectModelPackageVersion>1.0.0-rc3-003121</MicrosoftDotNetProjectModelPackageVersion> <MicrosoftDotNetProjectModelPackageVersion>1.0.0-rc3-003121</MicrosoftDotNetProjectModelPackageVersion>
<MicrosoftExtensionsPlatformAbstractionsPackageVersion>1.1.0</MicrosoftExtensionsPlatformAbstractionsPackageVersion> <MicrosoftExtensionsPlatformAbstractionsPackageVersion>1.1.0</MicrosoftExtensionsPlatformAbstractionsPackageVersion>

1
build/external-dependencies.props
View File

@ -68,6 +68,7 @@
<ExternalDependency Include="Microsoft.CSharp" Version="$(MicrosoftCSharpPackageVersion)" /> <ExternalDependency Include="Microsoft.CSharp" Version="$(MicrosoftCSharpPackageVersion)" />
<ExternalDependency Include="Microsoft.DotNet.PlatformAbstractions" Version="$(MicrosoftDotNetPlatformAbstractionsPackageVersion)" /> <ExternalDependency Include="Microsoft.DotNet.PlatformAbstractions" Version="$(MicrosoftDotNetPlatformAbstractionsPackageVersion)" />
<ExternalDependency Include="Microsoft.DotNet.ProjectModel" Version="$(MicrosoftDotNetProjectModelPackageVersion)" Private="true" /> <ExternalDependency Include="Microsoft.DotNet.ProjectModel" Version="$(MicrosoftDotNetProjectModelPackageVersion)" Private="true" />
<ExternalDependency Include="Microsoft.DiaSymReader.Native" Version="$(MicrosoftDiaSymReaderNativePackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
<ExternalDependency Include="Microsoft.Extensions.PlatformAbstractions" Version="$(MicrosoftExtensionsPlatformAbstractionsPackageVersion)" /> <ExternalDependency Include="Microsoft.Extensions.PlatformAbstractions" Version="$(MicrosoftExtensionsPlatformAbstractionsPackageVersion)" />
<ExternalDependency Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="$(MicrosoftIdentityModelClientsActiveDirectoryPackageVersion)" /> <ExternalDependency Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="$(MicrosoftIdentityModelClientsActiveDirectoryPackageVersion)" />

4
scripts/UpdateDependencies.ps1
View File

@ -81,13 +81,13 @@ if ($count -gt 0) {
$ConfigVars += "--UpdatedVersions" $ConfigVars += "--UpdatedVersions"
$varString = "" $varString = ""
foreach ($updatedVar in $updatedVars.GetEnumerator()) { foreach ($updatedVar in $updatedVars.GetEnumerator()) {
$varString += "$($updatedVar.Name)=$($updatedVar.Value);" $varString += "$($updatedVar.Name)=$($updatedVar.Value)+"
} }
$ConfigVars += $varString $ConfigVars += $varString
# Restore and run the app # Restore and run the app
Write-Host "Invoking App $ProjectPath..." Write-Host "Invoking App $ProjectPath..."
Invoke-Expression "dotnet run -p `"$ProjectPath`" @ConfigVars" Invoke-Expression "dotnet run -p `"$ProjectPath`" $ConfigVars"
if ($LASTEXITCODE -ne 0) { throw "Build failed" } if ($LASTEXITCODE -ne 0) { throw "Build failed" }
} }
else { else {

2
scripts/update-dependencies/Config.cs
View File

@ -19,7 +19,7 @@ namespace Microsoft.Dotnet.Scripts
{ {
get get
{ {
return UpdatedVersions.Split(';',System.StringSplitOptions.RemoveEmptyEntries); return UpdatedVersions.Split('+',System.StringSplitOptions.RemoveEmptyEntries);
} }
} }
} }