diff --git a/build.ps1 b/build.ps1 index 2210b5bd89927560a1a44b664bfecc2d9b20a2bd..470cd13b7da473fbb9c7a4716cdb748f5c586a08 100644 --- a/build.ps1 +++ b/build.ps1 @@ -273,6 +273,7 @@ $MSBuildArguments += "/p:_RunSign=$Sign" Import-Module -Force -Scope Local (Join-Path $korebuildPath 'KoreBuild.psd1') try { + $RepoRoot = Resolve-Path $RepoRoot Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $RepoRoot -ConfigFile $ConfigFile -CI:$CI if ($ForceCoreMsbuild) { $global:KoreBuildSettings.MSBuildType = 'core' diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets index ba064d3451636f94fa3492fe531d87878eed6bd6..1b06131f087e0f40565544ac001bf93a16102207 100644 --- a/build/RepositoryBuild.targets +++ b/build/RepositoryBuild.targets @@ -106,7 +106,7 @@ <Message Text="============ Building $(RepositoryToBuild) ============" Importance="High" /> <Exec - Command="./$(_BuildScriptToExecute) -RepoRoot $(BuildRepositoryRoot) $(BuildArguments)" + Command="./$(_BuildScriptToExecute) -RepoRoot $(BuildRepositoryRoot.TrimEnd('\').TrimEnd('/')) $(BuildArguments)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(RepositoryRoot)" IgnoreExitCode="true" diff --git a/eng/Versions.props b/eng/Versions.props index 8936a9d0fde90a471d913d3972e923543563d591..4224bee6ef459d9167f45b6b0b6f990def0cac90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -110,7 +110,7 @@ </PropertyGroup> <PropertyGroup Label="Build tool dependencies"> <InternalAspNetCoreSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSdkPackageVersion> - <InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">3.0.0-build-20190118.4</InternalAspNetCoreSdkPackageVersion> + <InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">3.0.0-build-20190122.3</InternalAspNetCoreSdkPackageVersion> <MicrosoftNETFrameworkReferenceAssembliesPackageVersion>1.0.0-alpha-004</MicrosoftNETFrameworkReferenceAssembliesPackageVersion> <MicrosoftNETTestSdkPackageVersion>15.9.0</MicrosoftNETTestSdkPackageVersion> </PropertyGroup> diff --git a/eng/signcheck.exclusions.txt b/eng/signcheck.exclusions.txt index acbdca8318631d97115959fb9484722f9cc0bf04..eda95be8993f17ea08a35cef03b2a8902801b4df 100644 --- a/eng/signcheck.exclusions.txt +++ b/eng/signcheck.exclusions.txt @@ -4,3 +4,4 @@ content/*.js;Microsoft.DotNet.Web.ProjectTemplates.*.nupkg; Exclude JavaScript f Templates/*.js;Microsoft.VisualStudio.Web.CodeGenerators.Mvc.*.nupkg; Exclude JavaScript files from codesigning in code generators *.js;signalr-*-javadoc.jar; Exclude JavaScript files in the generated javadocs *.binlog; Exclude msbuild log files +*.symbols.nupkg; Exclude NuGet symbols packages. These are not shipped to customers and should not be code signed. diff --git a/global.json b/global.json index 4b787112876b6e39b9cc7f3a64b0561b45bef1b4..4d190b7c6be2727f8607cde0e74a9b014e1d9856 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "version": "3.0.100-preview-009750" }, "msbuild-sdks": { - "Internal.AspNetCore.Sdk": "3.0.0-build-20190118.4" + "Internal.AspNetCore.Sdk": "3.0.0-build-20190122.3" } } diff --git a/korebuild-lock.txt b/korebuild-lock.txt index f48262d1e40089104ddc2cc28183c18f60108441..7c5c3f7bb77d4499df5bda41944a3a6765bfe41e 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-build-20190118.4 -commithash:dc060235e4056a2a5ec0141fa89da9e490544268 +version:3.0.0-build-20190122.3 +commithash:43e5fa8e3d8b192e573c3c14ae39b43e1d05cd5e