Skip to content

Commit 5cb615f

Browse files
committed
Merge in 'release/2.2' changes
2 parents 3a185ee + de5310e commit 5cb615f

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

build/RepositoryBuild.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
<Message Text="============ Building $(RepositoryToBuild) ============" Importance="High" />
130130

131131
<Exec
132-
Command="./$(_BuildScriptToExecute) -Path $(BuildRepositoryRoot) $(BuildArguments)"
132+
Command="./$(_BuildScriptToExecute) -Path $(BuildRepositoryRoot.TrimEnd('\')) $(BuildArguments)"
133133
IgnoreStandardErrorWarningFormat="true"
134134
WorkingDirectory="$(RepositoryRoot)"
135135
IgnoreExitCode="true"

build/dependencies.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<MicrosoftAspNetCoreBuildToolsApiCheckPackageVersion>$(KoreBuildVersion)</MicrosoftAspNetCoreBuildToolsApiCheckPackageVersion>
3333
<InternalAspNetCoreSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSdkPackageVersion>
3434
<InternalAspNetCoreSiteExtensionSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSiteExtensionSdkPackageVersion>
35-
<InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">2.2.1-build-20190110.1</InternalAspNetCoreSdkPackageVersion>
35+
<InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">2.2.1-build-20190318.1</InternalAspNetCoreSdkPackageVersion>
3636
</PropertyGroup>
3737

3838
<!-- These are package versions that should not be overridden or updated by automation. -->
@@ -173,7 +173,7 @@
173173
<MicrosoftNETCoreApp21PackageVersion>2.1.3</MicrosoftNETCoreApp21PackageVersion>
174174
<MicrosoftNETCoreDotNetAppHost21PackageVersion>$(MicrosoftNETCoreApp21PackageVersion)</MicrosoftNETCoreDotNetAppHost21PackageVersion>
175175
<MicrosoftNETCoreWindowsApiSetsPackageVersion>1.0.1</MicrosoftNETCoreWindowsApiSetsPackageVersion>
176-
<MicrosoftNETFrameworkReferenceAssembliesPackageVersion>1.0.0-alpha-004</MicrosoftNETFrameworkReferenceAssembliesPackageVersion>
176+
<MicrosoftNETFrameworkReferenceAssembliesPackageVersion>1.0.0-alpha-5</MicrosoftNETFrameworkReferenceAssembliesPackageVersion>
177177
<MicrosoftNETTestSdkPackageVersion>15.9.0</MicrosoftNETTestSdkPackageVersion>
178178
<MicrosoftOwinSecurityCookiesPackageVersion>3.0.1</MicrosoftOwinSecurityCookiesPackageVersion>
179179
<MicrosoftOwinSecurityPackageVersion>3.0.1</MicrosoftOwinSecurityPackageVersion>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"version": "2.2.102"
44
},
55
"msbuild-sdks": {
6-
"Internal.AspNetCore.Sdk": "2.2.1-build-20190117.2"
6+
"Internal.AspNetCore.Sdk": "2.2.1-build-20190318.1"
77
}
88
}

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.1-build-20190117.2
2-
commithash:66f8343ddf482908dd82005dd2154c9e2776e2a1
1+
version:2.2.1-build-20190318.1
2+
commithash:530ec9c3c7892073cd179a0ad7242d9398efd8e8

0 commit comments

Comments
 (0)