diff --git a/.gitignore b/.gitignore index 8fbeb143ae85eec6564b8d0e20c4678f7fd316f3..f32b5e1275f7a85b9602ffde8f4990067845ba6b 100644 --- a/.gitignore +++ b/.gitignore @@ -41,5 +41,4 @@ BuildInfo.generated.cs msbuild.log global.json *.g.targets -korebuild-lock.txt diff --git a/build.ps1 b/build.ps1 index b7081bc1c24c2c992f0cb27d7b6ea5731f48a658..f2be7cbb7cc7b3ae2f7297c0044a5b07e0bb9d95 100644 --- a/build.ps1 +++ b/build.ps1 @@ -103,11 +103,11 @@ function Get-KoreBuild { } } catch { - remove-item -Recurse -Force $korebuildPath -ErrorAction Ignore + Remove-Item -Recurse -Force $korebuildPath -ErrorAction Ignore throw } finally { - remove-item $tmpfile -ErrorAction Ignore + Remove-Item $tmpfile -ErrorAction Ignore } } diff --git a/build.sh b/build.sh index 5138fc4f22554c3ceecc486a6255c0451bccc681..14d84a877396812b8dd5789841f5237fcc588679 100755 --- a/build.sh +++ b/build.sh @@ -11,7 +11,7 @@ RED="\033[0;31m" YELLOW="\033[0;33m" MAGENTA="\033[0;95m" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -[ -z "${DOTNET_HOME:-}"] && DOTNET_HOME="$HOME/.dotnet" +[ -z "${DOTNET_HOME:-}" ] && DOTNET_HOME="$HOME/.dotnet" config_file="$DIR/korebuild.json" verbose=false update=false diff --git a/build/dependencies.props b/build/dependencies.props index 938f1a7b7e6e9f88048e56980d55a2a204cfe571..bbbda2449f4ea7e9ed66ed0a00f7d641dfa79a66 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,13 +1,13 @@ <Project> <PropertyGroup> - <InternalAspNetCoreSdkPackageVersion>2.0.2-beta-15522</InternalAspNetCoreSdkPackageVersion> - <MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion> - <MicrosoftAspNetCoreHostingPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreHostingPackageVersion> - <MicrosoftAspNetCoreMvcPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreMvcPackageVersion> - <MicrosoftAspNetCoreMvcRazorPagesPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreMvcRazorPagesPackageVersion> - <MicrosoftAspNetCoreRazorRuntimePackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreRazorRuntimePackageVersion> - <MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.4.1-rtm-83</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion> - <MicrosoftAspNetCoreServerKestrelPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreServerKestrelPackageVersion> + <InternalAspNetCoreSdkPackageVersion>2.0.2-rc1-15526</InternalAspNetCoreSdkPackageVersion> + <MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>2.0.1-rtm-105</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion> + <MicrosoftAspNetCoreHostingPackageVersion>2.0.1-rtm-105</MicrosoftAspNetCoreHostingPackageVersion> + <MicrosoftAspNetCoreMvcPackageVersion>2.0.1-rtm-105</MicrosoftAspNetCoreMvcPackageVersion> + <MicrosoftAspNetCoreMvcRazorPagesPackageVersion>2.0.1-rtm-105</MicrosoftAspNetCoreMvcRazorPagesPackageVersion> + <MicrosoftAspNetCoreRazorRuntimePackageVersion>2.0.1-rtm-105</MicrosoftAspNetCoreRazorRuntimePackageVersion> + <MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.4.1-rtm-105</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion> + <MicrosoftAspNetCoreServerKestrelPackageVersion>2.0.1-rtm-105</MicrosoftAspNetCoreServerKestrelPackageVersion> <MicrosoftAspNetCoreTestingPackageVersion>2.0.0</MicrosoftAspNetCoreTestingPackageVersion> <MicrosoftBuildTasksCorePackageVersion>15.3.409</MicrosoftBuildTasksCorePackageVersion> <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>2.0.0</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion> diff --git a/korebuild-lock.txt b/korebuild-lock.txt new file mode 100644 index 0000000000000000000000000000000000000000..632c589cce430d918cb0bb5897ea6f434d3a0d77 --- /dev/null +++ b/korebuild-lock.txt @@ -0,0 +1,2 @@ +version:2.0.2-rc1-15526 +commithash:436afc3dc08f5e278431db807866cc5f032f4d7b