diff --git a/.gitignore b/.gitignore index d8cc8fd3739a7826ae2c2f23c0fcad29825d66fc..b46d85fd20858229218ba1f7bfff6fea8430f6a1 100644 --- a/.gitignore +++ b/.gitignore @@ -30,4 +30,3 @@ project.lock.json .testPublish/ 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 e5399bbd8780ae8d5c5b5cd22dc6c079f4713232..faf740a3c46b7208c3899b896d16b000d6b13c24 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,35 +1,35 @@ <Project> <PropertyGroup> - <InternalAspNetCoreSdkPackageVersion>2.0.2-beta-15522</InternalAspNetCoreSdkPackageVersion> - <MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion> - <MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion> - <MicrosoftAspNetCoreAuthenticationGooglePackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreAuthenticationGooglePackageVersion> - <MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion> - <MicrosoftAspNetCoreAuthenticationTwitterPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreAuthenticationTwitterPackageVersion> - <MicrosoftAspNetCoreAuthorizationPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreAuthorizationPackageVersion> - <MicrosoftAspNetCoreCryptographyKeyDerivationPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreCryptographyKeyDerivationPackageVersion> - <MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion> - <MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion> - <MicrosoftAspNetCoreDiagnosticsPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreDiagnosticsPackageVersion> - <MicrosoftAspNetCoreHostingAbstractionsPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreHostingAbstractionsPackageVersion> - <MicrosoftAspNetCoreHostingPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreHostingPackageVersion> - <MicrosoftAspNetCoreHttpAbstractionsPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreHttpAbstractionsPackageVersion> - <MicrosoftAspNetCoreHttpPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreHttpPackageVersion> - <MicrosoftAspNetCoreMvcPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreMvcPackageVersion> - <MicrosoftAspNetCoreRewritePackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreRewritePackageVersion> - <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreServerIISIntegrationPackageVersion> - <MicrosoftAspNetCoreServerKestrelHttpsPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreServerKestrelHttpsPackageVersion> - <MicrosoftAspNetCoreServerKestrelPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreServerKestrelPackageVersion> - <MicrosoftAspNetCoreStaticFilesPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreStaticFilesPackageVersion> - <MicrosoftAspNetCoreTestHostPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreTestHostPackageVersion> + <InternalAspNetCoreSdkPackageVersion>2.0.2-rc1-15526</InternalAspNetCoreSdkPackageVersion> + <MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>2.0.1-rtm-105</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion> + <MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>2.0.1-rtm-105</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion> + <MicrosoftAspNetCoreAuthenticationGooglePackageVersion>2.0.1-rtm-105</MicrosoftAspNetCoreAuthenticationGooglePackageVersion> + <MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>2.0.1-rtm-105</MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion> + <MicrosoftAspNetCoreAuthenticationTwitterPackageVersion>2.0.1-rtm-105</MicrosoftAspNetCoreAuthenticationTwitterPackageVersion> + <MicrosoftAspNetCoreAuthorizationPackageVersion>2.0.1-rtm-105</MicrosoftAspNetCoreAuthorizationPackageVersion> + <MicrosoftAspNetCoreCryptographyKeyDerivationPackageVersion>2.0.1-rtm-105</MicrosoftAspNetCoreCryptographyKeyDerivationPackageVersion> + <MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion>2.0.1-rtm-105</MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion> + <MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>2.0.1-rtm-105</MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion> + <MicrosoftAspNetCoreDiagnosticsPackageVersion>2.0.1-rtm-105</MicrosoftAspNetCoreDiagnosticsPackageVersion> + <MicrosoftAspNetCoreHostingAbstractionsPackageVersion>2.0.1-rtm-105</MicrosoftAspNetCoreHostingAbstractionsPackageVersion> + <MicrosoftAspNetCoreHostingPackageVersion>2.0.1-rtm-105</MicrosoftAspNetCoreHostingPackageVersion> + <MicrosoftAspNetCoreHttpAbstractionsPackageVersion>2.0.1-rtm-105</MicrosoftAspNetCoreHttpAbstractionsPackageVersion> + <MicrosoftAspNetCoreHttpPackageVersion>2.0.1-rtm-105</MicrosoftAspNetCoreHttpPackageVersion> + <MicrosoftAspNetCoreMvcPackageVersion>2.0.1-rtm-105</MicrosoftAspNetCoreMvcPackageVersion> + <MicrosoftAspNetCoreRewritePackageVersion>2.0.1-rtm-105</MicrosoftAspNetCoreRewritePackageVersion> + <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.0.1-rtm-105</MicrosoftAspNetCoreServerIISIntegrationPackageVersion> + <MicrosoftAspNetCoreServerKestrelHttpsPackageVersion>2.0.1-rtm-105</MicrosoftAspNetCoreServerKestrelHttpsPackageVersion> + <MicrosoftAspNetCoreServerKestrelPackageVersion>2.0.1-rtm-105</MicrosoftAspNetCoreServerKestrelPackageVersion> + <MicrosoftAspNetCoreStaticFilesPackageVersion>2.0.1-rtm-105</MicrosoftAspNetCoreStaticFilesPackageVersion> + <MicrosoftAspNetCoreTestHostPackageVersion>2.0.1-rtm-105</MicrosoftAspNetCoreTestHostPackageVersion> <MicrosoftAspNetCoreTestingPackageVersion>2.0.0</MicrosoftAspNetCoreTestingPackageVersion> <MicrosoftAspNetIdentityEntityFrameworkPackageVersion>2.2.1</MicrosoftAspNetIdentityEntityFrameworkPackageVersion> <MicrosoftAzureKeyVaultPackageVersion>2.3.2</MicrosoftAzureKeyVaultPackageVersion> - <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>2.0.1-rtm-83</MicrosoftEntityFrameworkCoreInMemoryPackageVersion> - <MicrosoftEntityFrameworkCoreRelationalPackageVersion>2.0.1-rtm-83</MicrosoftEntityFrameworkCoreRelationalPackageVersion> - <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.0.1-rtm-83</MicrosoftEntityFrameworkCoreSqlServerPackageVersion> - <MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion>2.0.1-rtm-83</MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion> - <MicrosoftEntityFrameworkCoreToolsPackageVersion>2.0.1-rtm-83</MicrosoftEntityFrameworkCoreToolsPackageVersion> + <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>2.0.1-rtm-105</MicrosoftEntityFrameworkCoreInMemoryPackageVersion> + <MicrosoftEntityFrameworkCoreRelationalPackageVersion>2.0.1-rtm-105</MicrosoftEntityFrameworkCoreRelationalPackageVersion> + <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.0.1-rtm-105</MicrosoftEntityFrameworkCoreSqlServerPackageVersion> + <MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion>2.0.1-rtm-105</MicrosoftEntityFrameworkCoreToolsDotNetPackageVersion> + <MicrosoftEntityFrameworkCoreToolsPackageVersion>2.0.1-rtm-105</MicrosoftEntityFrameworkCoreToolsPackageVersion> <MicrosoftExtensionsConfigurationBinderPackageVersion>2.0.0</MicrosoftExtensionsConfigurationBinderPackageVersion> <MicrosoftExtensionsConfigurationCommandLinePackageVersion>2.0.0</MicrosoftExtensionsConfigurationCommandLinePackageVersion> <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>2.0.0</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion> @@ -51,10 +51,10 @@ <MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>2.1.4</MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion> <MicrosoftNETTestSdkPackageVersion>15.3.0</MicrosoftNETTestSdkPackageVersion> <MicrosoftOwinSecurityCookiesPackageVersion>3.0.1</MicrosoftOwinSecurityCookiesPackageVersion> - <MicrosoftOwinSecurityInteropPackageVersion>2.0.1-rtm-83</MicrosoftOwinSecurityInteropPackageVersion> - <MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion>2.0.1-rtm-83</MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion> + <MicrosoftOwinSecurityInteropPackageVersion>2.0.1-rtm-105</MicrosoftOwinSecurityInteropPackageVersion> + <MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion>2.0.1-rtm-105</MicrosoftVisualStudioWebCodeGenerationToolsPackageVersion> <MoqPackageVersion>4.7.49</MoqPackageVersion> - <RazorPageGeneratorPackageVersion>2.0.1-rtm-83</RazorPageGeneratorPackageVersion> + <RazorPageGeneratorPackageVersion>2.0.1-rtm-105</RazorPageGeneratorPackageVersion> <SystemComponentModelAnnotationsPackageVersion>4.4.0</SystemComponentModelAnnotationsPackageVersion> <XunitPackageVersion>2.3.0-beta2-build3683</XunitPackageVersion> <XunitStablePackageVersion>2.2.0</XunitStablePackageVersion> 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