Skip to content

Commit 071a49e

Browse files
rynowakrynowak
authored
Merge branch 'master' into merge/release/2.2-to-master
2 parents 204ff0a + dd46e7e commit 071a49e

File tree

15 files changed

+54
-56
lines changed

15 files changed

+54
-56
lines changed

‎.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ init:
22
- git config --global core.autocrlf true
33
branches:
44
only:
5-
- dev
5+
- master
66
- /^release\/.*$/
77
- /^(.*\/)?ci-.*$/
88
build_script:

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ addons:
1616
- libunwind8
1717
branches:
1818
only:
19-
- dev
19+
- master
2020
- /^release\/.*$/
2121
- /^(.*\/)?ci-.*$/
2222
before_install:

‎.vsts-pipelines/builds/ci-internal.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ resources:
77
- repository: buildtools
88
type: git
99
name: aspnet-BuildTools
10-
ref: refs/heads/release/2.2
10+
ref: refs/heads/master
1111

1212
phases:
1313
- template: .vsts-pipelines/templates/project-ci.yml@buildtools

‎.vsts-pipelines/builds/ci-public.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ resources:
99
type: github
1010
endpoint: DotNet-Bot GitHub Connection
1111
name: aspnet/BuildTools
12-
ref: refs/heads/release/2.2
12+
ref: refs/heads/master
1313

1414
phases:
1515
- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools

‎CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Contributing
22
======
33

4-
Information on contributing to this repo is in the [Contributing Guide](https://github.com/aspnet/Home/blob/dev/CONTRIBUTING.md) in the Home repo.
4+
Information on contributing to this repo is in the [Contributing Guide](https://github.com/aspnet/Home/blob/master/CONTRIBUTING.md) in the Home repo.

‎build/dependencies.props

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,45 @@
33
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
44
</PropertyGroup>
55
<PropertyGroup Label="Package Versions">
6-
<InternalAspNetCoreSdkPackageVersion>2.2.0-preview1-20180918.1</InternalAspNetCoreSdkPackageVersion>
7-
<MicrosoftAspNetCoreHostingAbstractionsPackageVersion>2.2.0-preview3-35301</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
8-
<MicrosoftAspNetCoreHttpAbstractionsPackageVersion>2.2.0-preview3-35301</MicrosoftAspNetCoreHttpAbstractionsPackageVersion>
9-
<MicrosoftAspNetCoreHttpExtensionsPackageVersion>2.2.0-preview3-35301</MicrosoftAspNetCoreHttpExtensionsPackageVersion>
10-
<MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.2.0-preview3-35301</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
11-
<MicrosoftAspNetCoreServerKestrelPackageVersion>2.2.0-preview3-35301</MicrosoftAspNetCoreServerKestrelPackageVersion>
12-
<MicrosoftAspNetCoreStaticFilesPackageVersion>2.2.0-preview3-35301</MicrosoftAspNetCoreStaticFilesPackageVersion>
13-
<MicrosoftAspNetCoreTestHostPackageVersion>2.2.0-preview3-35301</MicrosoftAspNetCoreTestHostPackageVersion>
14-
<MicrosoftAspNetCoreTestingPackageVersion>2.2.0-preview3-35301</MicrosoftAspNetCoreTestingPackageVersion>
15-
<MicrosoftAspNetCoreWebUtilitiesPackageVersion>2.2.0-preview3-35301</MicrosoftAspNetCoreWebUtilitiesPackageVersion>
16-
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>2.2.0-preview3-35301</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
17-
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>2.2.0-preview3-35301</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
18-
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.2.0-preview3-35301</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
19-
<MicrosoftExtensionsConfigurationCommandLinePackageVersion>2.2.0-preview3-35301</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
20-
<MicrosoftExtensionsConfigurationJsonPackageVersion>2.2.0-preview3-35301</MicrosoftExtensionsConfigurationJsonPackageVersion>
21-
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>2.2.0-preview3-35301</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
22-
<MicrosoftExtensionsDependencyInjectionPackageVersion>2.2.0-preview3-35301</MicrosoftExtensionsDependencyInjectionPackageVersion>
23-
<MicrosoftExtensionsDiagnosticAdapterPackageVersion>2.2.0-preview3-35301</MicrosoftExtensionsDiagnosticAdapterPackageVersion>
24-
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>2.2.0-preview3-35301</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
25-
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>2.2.0-preview3-35301</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
26-
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>2.2.0-preview3-35301</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
27-
<MicrosoftExtensionsLoggingConsolePackageVersion>2.2.0-preview3-35301</MicrosoftExtensionsLoggingConsolePackageVersion>
28-
<MicrosoftExtensionsLoggingPackageVersion>2.2.0-preview3-35301</MicrosoftExtensionsLoggingPackageVersion>
29-
<MicrosoftExtensionsLoggingTestingPackageVersion>2.2.0-preview3-35301</MicrosoftExtensionsLoggingTestingPackageVersion>
30-
<MicrosoftExtensionsOptionsPackageVersion>2.2.0-preview3-35301</MicrosoftExtensionsOptionsPackageVersion>
31-
<MicrosoftExtensionsRazorViewsSourcesPackageVersion>2.2.0-preview3-35301</MicrosoftExtensionsRazorViewsSourcesPackageVersion>
32-
<MicrosoftExtensionsStackTraceSourcesPackageVersion>2.2.0-preview3-35301</MicrosoftExtensionsStackTraceSourcesPackageVersion>
33-
<MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>2.2.0-preview3-35301</MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>
34-
<MicrosoftExtensionsValueStopwatchSourcesPackageVersion>2.2.0-preview3-35301</MicrosoftExtensionsValueStopwatchSourcesPackageVersion>
6+
<InternalAspNetCoreSdkPackageVersion>3.0.0-alpha1-20180919.1</InternalAspNetCoreSdkPackageVersion>
7+
<MicrosoftAspNetCoreHostingAbstractionsPackageVersion>3.0.0-alpha1-10495</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
8+
<MicrosoftAspNetCoreHttpAbstractionsPackageVersion>3.0.0-alpha1-10495</MicrosoftAspNetCoreHttpAbstractionsPackageVersion>
9+
<MicrosoftAspNetCoreHttpExtensionsPackageVersion>3.0.0-alpha1-10495</MicrosoftAspNetCoreHttpExtensionsPackageVersion>
10+
<MicrosoftAspNetCoreServerIISIntegrationPackageVersion>3.0.0-alpha1-10495</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
11+
<MicrosoftAspNetCoreServerKestrelPackageVersion>3.0.0-alpha1-10495</MicrosoftAspNetCoreServerKestrelPackageVersion>
12+
<MicrosoftAspNetCoreStaticFilesPackageVersion>3.0.0-alpha1-10495</MicrosoftAspNetCoreStaticFilesPackageVersion>
13+
<MicrosoftAspNetCoreTestHostPackageVersion>3.0.0-alpha1-10495</MicrosoftAspNetCoreTestHostPackageVersion>
14+
<MicrosoftAspNetCoreTestingPackageVersion>3.0.0-alpha1-10495</MicrosoftAspNetCoreTestingPackageVersion>
15+
<MicrosoftAspNetCoreWebUtilitiesPackageVersion>3.0.0-alpha1-10495</MicrosoftAspNetCoreWebUtilitiesPackageVersion>
16+
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>3.0.0-alpha1-10495</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
17+
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>3.0.0-alpha1-10495</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
18+
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>3.0.0-alpha1-10495</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
19+
<MicrosoftExtensionsConfigurationCommandLinePackageVersion>3.0.0-alpha1-10495</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
20+
<MicrosoftExtensionsConfigurationJsonPackageVersion>3.0.0-alpha1-10495</MicrosoftExtensionsConfigurationJsonPackageVersion>
21+
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>3.0.0-alpha1-10495</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
22+
<MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-alpha1-10495</MicrosoftExtensionsDependencyInjectionPackageVersion>
23+
<MicrosoftExtensionsDiagnosticAdapterPackageVersion>3.0.0-alpha1-10495</MicrosoftExtensionsDiagnosticAdapterPackageVersion>
24+
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>3.0.0-alpha1-10495</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
25+
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>3.0.0-alpha1-10495</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
26+
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>3.0.0-alpha1-10495</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
27+
<MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-alpha1-10495</MicrosoftExtensionsLoggingConsolePackageVersion>
28+
<MicrosoftExtensionsLoggingPackageVersion>3.0.0-alpha1-10495</MicrosoftExtensionsLoggingPackageVersion>
29+
<MicrosoftExtensionsLoggingTestingPackageVersion>3.0.0-alpha1-10495</MicrosoftExtensionsLoggingTestingPackageVersion>
30+
<MicrosoftExtensionsOptionsPackageVersion>3.0.0-alpha1-10495</MicrosoftExtensionsOptionsPackageVersion>
31+
<MicrosoftExtensionsRazorViewsSourcesPackageVersion>3.0.0-alpha1-10495</MicrosoftExtensionsRazorViewsSourcesPackageVersion>
32+
<MicrosoftExtensionsStackTraceSourcesPackageVersion>3.0.0-alpha1-10495</MicrosoftExtensionsStackTraceSourcesPackageVersion>
33+
<MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>3.0.0-alpha1-10495</MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>
34+
<MicrosoftExtensionsValueStopwatchSourcesPackageVersion>3.0.0-alpha1-10495</MicrosoftExtensionsValueStopwatchSourcesPackageVersion>
3535
<MicrosoftNETCoreApp20PackageVersion>2.0.9</MicrosoftNETCoreApp20PackageVersion>
3636
<MicrosoftNETCoreApp21PackageVersion>2.1.3</MicrosoftNETCoreApp21PackageVersion>
3737
<MicrosoftNETCoreApp22PackageVersion>2.2.0-preview2-26905-02</MicrosoftNETCoreApp22PackageVersion>
3838
<MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
39-
<MicrosoftNetHttpHeadersPackageVersion>2.2.0-preview3-35252</MicrosoftNetHttpHeadersPackageVersion>
40-
<MoqPackageVersion>4.7.49</MoqPackageVersion>
39+
<MicrosoftNetHttpHeadersPackageVersion>3.0.0-alpha1-10495</MicrosoftNetHttpHeadersPackageVersion>
40+
<MoqPackageVersion>4.9.0</MoqPackageVersion>
4141
<NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
4242
<NewtonsoftJsonPackageVersion>11.0.2</NewtonsoftJsonPackageVersion>
43-
<SystemDataSqlClientPackageVersion>4.6.0-preview2-26905-02</SystemDataSqlClientPackageVersion>
44-
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.0</SystemDiagnosticsDiagnosticSourcePackageVersion>
43+
<SystemDataSqlClientPackageVersion>4.6.0-preview1-26907-04</SystemDataSqlClientPackageVersion>
44+
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.6.0-preview1-26907-04</SystemDiagnosticsDiagnosticSourcePackageVersion>
4545
<SystemReflectionMetadataPackageVersion>1.6.0</SystemReflectionMetadataPackageVersion>
4646
<XunitPackageVersion>2.3.1</XunitPackageVersion>
4747
<XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>

‎build/repo.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<PropertyGroup>
88
<!-- These properties are use by the automation that updates dependencies.props -->
99
<LineupPackageId>Internal.AspNetCore.Universe.Lineup</LineupPackageId>
10-
<LineupPackageVersion>2.2.0-*</LineupPackageVersion>
1110
<LineupPackageRestoreSource>https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json</LineupPackageRestoreSource>
1211
</PropertyGroup>
1312

‎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.0-preview1-20180918.1
2-
commithash:ad5e3fc53442741a0dd49bce437d2ac72f4b5800
1+
version:3.0.0-alpha1-20180919.1
2+
commithash:3066ae0a230870ea07e3f132605b5e5493f8bbd4

‎korebuild.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.2/tools/korebuild.schema.json",
3-
"channel": "release/2.2"
2+
"$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
3+
"channel": "master"
44
}

‎run.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ in the file are overridden by command line parameters.
5252
Example config file:
5353
```json
5454
{
55-
"$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
56-
"channel": "dev",
55+
"$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
56+
"channel": "master",
5757
"toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools"
5858
}
5959
```
@@ -192,7 +192,7 @@ if (!$DotNetHome) {
192192
else { Join-Path $PSScriptRoot '.dotnet'}
193193
}
194194

195-
if (!$Channel) { $Channel = 'dev' }
195+
if (!$Channel) { $Channel = 'master' }
196196
if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' }
197197

198198
# Execute

‎run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ if [ -f "$config_file" ]; then
248248
[ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source"
249249
fi
250250

251-
[ -z "$channel" ] && channel='dev'
251+
[ -z "$channel" ] && channel='master'
252252
[ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools'
253253

254254
get_korebuild

‎src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Internal/DiagnosticsEntityFrameworkCoreLoggerExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ internal static class DiagnosticsEntityFrameworkCoreLoggerExtensions
1212
private static readonly Action<ILogger, Exception> _noContextType = LoggerMessage.Define(
1313
LogLevel.Error,
1414
new EventId(1, "NoContextType"),
15-
"No context type was specified. Ensure the form data from the request includes a contextTypeName value, specifying the context to apply migrations for.");
15+
"No context type was specified. Ensure the form data from the request includes a 'context' value, specifying the context type name to apply migrations for.");
1616

1717
private static readonly Action<ILogger, string, Exception> _invalidContextType = LoggerMessage.Define<string>(
1818
LogLevel.Error,

‎src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Properties/Strings.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/Strings.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
<value>The context type '{0}' could not be loaded. Ensure this is the correct type name for the context you are trying to apply migrations for.</value>
176176
</data>
177177
<data name="MigrationsEndPointMiddleware_NoContextType" xml:space="preserve">
178-
<value>No context type was specified. Ensure the form data from the request includes a contextTypeName value, specifying the context to apply migrations for.</value>
178+
<value>No context type was specified. Ensure the form data from the request includes a 'context' value, specifying the context type name to apply migrations for.</value>
179179
</data>
180180
<data name="DatabaseErrorPage_Title" xml:space="preserve">
181181
<value>A database operation failed while processing the request.</value>

‎version.props

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
<Project>
1+
<Project>
22
<PropertyGroup>
3-
<VersionPrefix>2.2.0</VersionPrefix>
4-
<VersionSuffix>preview3</VersionSuffix>
3+
<VersionPrefix>3.0.0</VersionPrefix>
4+
<VersionSuffix>alpha1</VersionSuffix>
55
<PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
66
<PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>
77
<BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>
88
<FeatureBranchVersionPrefix Condition="'$(FeatureBranchVersionPrefix)' == ''">a-</FeatureBranchVersionPrefix>
99
<VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(FeatureBranchVersionSuffix)' != ''">$(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-'))</VersionSuffix>
1010
<VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
11-
12-
<ExperimentalVersionPrefix>0.5.0</ExperimentalVersionPrefix>
13-
<ExperimentalVersionSuffix>preview3</ExperimentalVersionSuffix>
11+
<ExperimentalVersionPrefix>0.6.0</ExperimentalVersionPrefix>
12+
<ExperimentalVersionSuffix>alpha1</ExperimentalVersionSuffix>
1413
<ExperimentalPackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(ExperimentalVersionSuffix)' == 'rtm' ">$(ExperimentalVersionPrefix)</ExperimentalPackageVersion>
1514
<ExperimentalPackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(ExperimentalVersionSuffix)' != 'rtm' ">$(ExperimentalVersionPrefix)-$(ExperimentalVersionSuffix)-final</ExperimentalPackageVersion>
1615
<ExperimentalVersionSuffix Condition="'$(ExperimentalVersionSuffix)' != '' And '$(BuildNumber)' != ''">$(ExperimentalVersionSuffix)-$(BuildNumber)</ExperimentalVersionSuffix>

0 commit comments

Comments
 (0)