Skip to content

Commit

Permalink
Merge in 'release/2.2' changes
Browse files Browse the repository at this point in the history
  • Loading branch information
dotnet-bot committed Mar 18, 2019
2 parents 3a185ee + de5310e commit 5cb615f
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion build/RepositoryBuild.targets
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions build/dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -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. -->
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
4 changes: 2 additions & 2 deletions korebuild-lock.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version:2.2.1-build-20190117.2
commithash:66f8343ddf482908dd82005dd2154c9e2776e2a1
version:2.2.1-build-20190318.1
commithash:530ec9c3c7892073cd179a0ad7242d9398efd8e8
2 changes: 1 addition & 1 deletion modules/EntityFrameworkCore

0 comments on commit 5cb615f

Please sign in to comment.