diff options
| author | dotnet-bot <dotnet-bot@microsoft.com> | 2019-03-19 00:50:48 +0300 |
|---|---|---|
| committer | dotnet-bot <dotnet-bot@microsoft.com> | 2019-03-19 00:50:48 +0300 |
| commit | 5cb615fcbe8559e49042e93394008077e30454c0 (patch) | |
| tree | 9d4ef23f7f8a5675f4e1efd2f08244b53f76e08f | |
| parent | 3a185ee0c5494a5ba21b748f3c58cb826a186051 (diff) | |
| parent | de5310e886d360baac460a5094db1a67c44a1784 (diff) | |
Merge in 'release/2.2' changesv2.2.4
| -rw-r--r-- | build/RepositoryBuild.targets | 2 | ||||
| -rw-r--r-- | build/dependencies.props | 4 | ||||
| -rw-r--r-- | global.json | 2 | ||||
| -rw-r--r-- | korebuild-lock.txt | 4 | ||||
| m--------- | modules/EntityFrameworkCore | 0 |
5 files changed, 6 insertions, 6 deletions
diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets index ee91e3a2ca..265150d565 100644 --- a/build/RepositoryBuild.targets +++ b/build/RepositoryBuild.targets @@ -129,7 +129,7 @@ <Message Text="============ Building $(RepositoryToBuild) ============" Importance="High" /> <Exec - Command="./$(_BuildScriptToExecute) -Path $(BuildRepositoryRoot) $(BuildArguments)" + Command="./$(_BuildScriptToExecute) -Path $(BuildRepositoryRoot.TrimEnd('\')) $(BuildArguments)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(RepositoryRoot)" IgnoreExitCode="true" diff --git a/build/dependencies.props b/build/dependencies.props index cfe9644e75..6bd81edf5a 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -32,7 +32,7 @@ <MicrosoftAspNetCoreBuildToolsApiCheckPackageVersion>$(KoreBuildVersion)</MicrosoftAspNetCoreBuildToolsApiCheckPackageVersion> <InternalAspNetCoreSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSdkPackageVersion> <InternalAspNetCoreSiteExtensionSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSiteExtensionSdkPackageVersion> - <InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">2.2.1-build-20190110.1</InternalAspNetCoreSdkPackageVersion> + <InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">2.2.1-build-20190318.1</InternalAspNetCoreSdkPackageVersion> </PropertyGroup> <!-- These are package versions that should not be overridden or updated by automation. --> @@ -173,7 +173,7 @@ <MicrosoftNETCoreApp21PackageVersion>2.1.3</MicrosoftNETCoreApp21PackageVersion> <MicrosoftNETCoreDotNetAppHost21PackageVersion>$(MicrosoftNETCoreApp21PackageVersion)</MicrosoftNETCoreDotNetAppHost21PackageVersion> <MicrosoftNETCoreWindowsApiSetsPackageVersion>1.0.1</MicrosoftNETCoreWindowsApiSetsPackageVersion> - <MicrosoftNETFrameworkReferenceAssembliesPackageVersion>1.0.0-alpha-004</MicrosoftNETFrameworkReferenceAssembliesPackageVersion> + <MicrosoftNETFrameworkReferenceAssembliesPackageVersion>1.0.0-alpha-5</MicrosoftNETFrameworkReferenceAssembliesPackageVersion> <MicrosoftNETTestSdkPackageVersion>15.9.0</MicrosoftNETTestSdkPackageVersion> <MicrosoftOwinSecurityCookiesPackageVersion>3.0.1</MicrosoftOwinSecurityCookiesPackageVersion> <MicrosoftOwinSecurityPackageVersion>3.0.1</MicrosoftOwinSecurityPackageVersion> diff --git a/global.json b/global.json index f2958a2808..b7ba160d3f 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "version": "2.2.102" }, "msbuild-sdks": { - "Internal.AspNetCore.Sdk": "2.2.1-build-20190117.2" + "Internal.AspNetCore.Sdk": "2.2.1-build-20190318.1" } } diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 3ac9e66dcc..046ff6d26a 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.1-build-20190117.2 -commithash:66f8343ddf482908dd82005dd2154c9e2776e2a1 +version:2.2.1-build-20190318.1 +commithash:530ec9c3c7892073cd179a0ad7242d9398efd8e8 diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore -Subproject bf24028cec2e5f63c02307865729f3c1b3afcf3 +Subproject d1b10fc6ccca83e29109a0a8d9c047f2e68aede |