DataProtection 292 B

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394
  1. commit c4c6e1b0e9667662646939139205e12bf57e865c
  2. Author: Nate McMaster <[email protected]>
  3. Date: Thu Jan 18 16:27:57 2018 -0800
  4. Bump version, update build tools, and dependency versions
  5. diff --git a/Directory.Build.props b/Directory.Build.props
  6. new file mode 100644
  7. index 00000000000..e3f34ed9902
  8. --- /dev/null
  9. +++ b/Directory.Build.props
  10. @@ -0,0 +1,9 @@
  11. +<Project>
  12. + <Import Project="version.props" />
  13. + <Import Project="build\dependencies.props" />
  14. + <Import Project="build\sources.props" />
  15. +
  16. + <PropertyGroup>
  17. + <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
  18. + </PropertyGroup>
  19. +</Project>
  20. diff --git a/Directory.Build.targets b/Directory.Build.targets
  21. index 246f7ac20c4..58066966aad 100644
  22. --- a/Directory.Build.targets
  23. +++ b/Directory.Build.targets
  24. @@ -1,4 +1,6 @@
  25. <Project>
  26. - <Import Project="build\sources.props" />
  27. - <Import Project="build\dependencies.props" />
  28. + <PropertyGroup>
  29. + <NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
  30. + <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
  31. + </PropertyGroup>
  32. </Project>
  33. diff --git a/build/common.props b/build/common.props
  34. index c967a47ed87..7362e803fa3 100644
  35. --- a/build/common.props
  36. +++ b/build/common.props
  37. @@ -1,5 +1,4 @@
  38. -<Project>
  39. - <Import Project="..\version.props" />
  40. +<Project>
  41. <PropertyGroup>
  42. <Product>Microsoft ASP.NET Core</Product>
  43. diff --git a/build/dependencies.props b/build/dependencies.props
  44. index 5c7eeef915b..7a9415a927b 100644
  45. --- a/build/dependencies.props
  46. +++ b/build/dependencies.props
  47. @@ -11,7 +11,9 @@
  48. <MicrosoftExtensionsLoggingPackageVersion>2.0.0</MicrosoftExtensionsLoggingPackageVersion>
  49. <MicrosoftExtensionsOptionsPackageVersion>2.0.0</MicrosoftExtensionsOptionsPackageVersion>
  50. <MicrosoftExtensionsWebEncodersSourcesPackageVersion>2.0.0</MicrosoftExtensionsWebEncodersSourcesPackageVersion>
  51. + <MicrosoftNETCoreApp20PackageVersion>2.0.5</MicrosoftNETCoreApp20PackageVersion>
  52. <MicrosoftNETTestSdkPackageVersion>15.3.0</MicrosoftNETTestSdkPackageVersion>
  53. + <NETStandardLibrary20PackageVersion>2.0.1</NETStandardLibrary20PackageVersion>
  54. <MicrosoftWin32RegistryPackageVersion>4.4.0</MicrosoftWin32RegistryPackageVersion>
  55. <MoqPackageVersion>4.7.49</MoqPackageVersion>
  56. <StackExchangeRedisStrongNamePackageVersion>1.2.4</StackExchangeRedisStrongNamePackageVersion>
  57. diff --git a/korebuild-lock.txt b/korebuild-lock.txt
  58. index 632c589cce4..e0cb1b1c60f 100644
  59. --- a/korebuild-lock.txt
  60. +++ b/korebuild-lock.txt
  61. @@ -1,2 +1,2 @@
  62. -version:2.0.2-rc1-15526
  63. -commithash:436afc3dc08f5e278431db807866cc5f032f4d7b
  64. +version:2.0.5-rtm-10016
  65. +commithash:02bda79ac9c564229da734a836f258d6c1321eb7
  66. diff --git a/korebuild.json b/korebuild.json
  67. index 6bbc5eeb9cd..9deb2b62d78 100644
  68. --- a/korebuild.json
  69. +++ b/korebuild.json
  70. @@ -1,4 +1,4 @@
  71. {
  72. - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/rel/2.0.2/tools/korebuild.schema.json",
  73. - "channel": "rel/2.0.2"
  74. + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.0/tools/korebuild.schema.json",
  75. + "channel": "release/2.0"
  76. }
  77. diff --git a/version.props b/version.props
  78. index 3e4b5d6f6d9..ae37ea60681 100644
  79. --- a/version.props
  80. +++ b/version.props
  81. @@ -1,7 +1,7 @@
  82. -<Project>
  83. +<Project>
  84. <PropertyGroup>
  85. - <VersionPrefix>2.0.1</VersionPrefix>
  86. - <ExperimentalProjectVersionPrefix>0.3.1</ExperimentalProjectVersionPrefix>
  87. + <VersionPrefix>2.0.2</VersionPrefix>
  88. + <ExperimentalProjectVersionPrefix>0.3.2</ExperimentalProjectVersionPrefix>
  89. <VersionSuffix>rtm</VersionSuffix>
  90. <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
  91. <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>