Skip to content

Commit 5854e03

Browse files
shirhattijhkimnew
shirhatti
authored and
jhkimnew
committed
Update Korebuild and dependency versions (#85)
Merging
1 parent 5ae8155 commit 5854e03

File tree

8 files changed

+65
-27
lines changed

8 files changed

+65
-27
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,5 @@ src/AspNetCore/aspnetcore_msg.rc
4848
src/AspNetCore/version.h
4949
.build
5050

51-
*.VC.*db
51+
*.VC.*db
52+
global.json

‎Build/Key.snk

596 Bytes
Binary file not shown.

‎Build/common.props

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<Project>
2+
<Import Project="dependencies.props" />
3+
<Import Project="..\version.props" />
4+
5+
<PropertyGroup>
6+
<Product>Microsoft ASP.NET Core</Product>
7+
<RepositoryUrl>https://github.com/aspnet/AspNetCoreModule</RepositoryUrl>
8+
<RepositoryType>git</RepositoryType>
9+
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Key.snk</AssemblyOriginatorKeyFile>
10+
<SignAssembly>true</SignAssembly>
11+
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
12+
<VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
13+
</PropertyGroup>
14+
15+
<ItemGroup>
16+
<PackageReference Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkVersion)" PrivateAssets="All" />
17+
</ItemGroup>
18+
19+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework' AND '$(OutputType)'=='library'">
20+
<PackageReference Include="NETStandard.Library" Version="$(NetStandardImplicitPackageVersion)" />
21+
</ItemGroup>
22+
23+
</Project>

‎Build/dependencies.props

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<Project>
2+
<PropertyGroup>
3+
<AspNetCoreVersion>1.2.0-*</AspNetCoreVersion>
4+
<CoreFxVersion>4.3.0</CoreFxVersion>
5+
<InternalAspNetCoreSdkVersion>2.0.0-*</InternalAspNetCoreSdkVersion>
6+
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
7+
<RuntimeFrameworkVersion>2.0.0-*</RuntimeFrameworkVersion>
8+
<TestSdkVersion>15.0.0</TestSdkVersion>
9+
<XunitVersion>2.2.0</XunitVersion>
10+
</PropertyGroup>
11+
</Project>

‎NuGet.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<configuration>
33
<packageSources>
44
<add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json" />
5-
<add key="AspNetCore-Patch" value="https://dotnet.myget.org/F/aspnetcore-rel-1-0-3/api/v3/index.json" />
5+
<add key="AspNetCoreTools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" />
66
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
77
</packageSources>
8-
</configuration>
8+
</configuration>

‎build.ps1

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
$ErrorActionPreference = "Stop"
22

3-
function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $retries)
3+
function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $retries)
44
{
55
while($true)
66
{
@@ -19,7 +19,7 @@ function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $ret
1919
Start-Sleep -Seconds 10
2020

2121
}
22-
else
22+
else
2323
{
2424
$exception = $_.Exception
2525
throw $exception
@@ -33,7 +33,7 @@ cd $PSScriptRoot
3333
$repoFolder = $PSScriptRoot
3434
$env:REPO_FOLDER = $repoFolder
3535

36-
$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/feature/msbuild.zip"
36+
$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
3737
if ($env:KOREBUILD_ZIP)
3838
{
3939
$koreBuildZip=$env:KOREBUILD_ZIP
@@ -43,18 +43,18 @@ $buildFolder = ".build"
4343
$buildFile="$buildFolder\KoreBuild.ps1"
4444

4545
if (!(Test-Path $buildFolder)) {
46-
Write-Host "Downloading KoreBuild from $koreBuildZip"
47-
46+
Write-Host "Downloading KoreBuild from $koreBuildZip"
47+
4848
$tempFolder=$env:TEMP + "\KoreBuild-" + [guid]::NewGuid()
4949
New-Item -Path "$tempFolder" -Type directory | Out-Null
5050

5151
$localZipFile="$tempFolder\korebuild.zip"
52-
52+
5353
DownloadWithRetry -url $koreBuildZip -downloadLocation $localZipFile -retries 6
5454

5555
Add-Type -AssemblyName System.IO.Compression.FileSystem
5656
[System.IO.Compression.ZipFile]::ExtractToDirectory($localZipFile, $tempFolder)
57-
57+
5858
New-Item -Path "$buildFolder" -Type directory | Out-Null
5959
copy-item "$tempFolder\**\build\*" $buildFolder -Recurse
6060

@@ -64,4 +64,4 @@ if (!(Test-Path $buildFolder)) {
6464
}
6565
}
6666

67-
&"$buildFile" $args
67+
&"$buildFile" @args

‎test/AspNetCoreModule.Test/aspnetcoremodule.test.csproj

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<Import Project="..\..\build\common.props" />
34
<PropertyGroup>
4-
<TargetFramework>net452</TargetFramework>
5+
<TargetFramework>net46</TargetFramework>
56
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
67
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
78
</PropertyGroup>
@@ -14,22 +15,17 @@
1415
</ItemGroup>
1516

1617
<ItemGroup>
17-
<PackageReference Include="Microsoft.AspNetCore.Testing" Version="1.2.0-*" />
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
19-
<PackageReference Include="Microsoft.TestPlatform.TestHost" Version="15.0.0" />
18+
<PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(AspNetCoreVersion)" />
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
20+
<PackageReference Include="xunit" Version="$(XunitVersion)" />
21+
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
2022
<PackageReference Include="Microsoft.Web.Administration" Version="7.0.0" />
21-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.2.0-*" />
22-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.2.0-*" />
23-
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.2.0-*" />
24-
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
25-
<PackageReference Include="Microsoft.Net.Http.Headers" Version="1.1.0" />
26-
<PackageReference Include="System.Management.Automation.dll" Version="10.0.10586" />
27-
<PackageReference Include="xunit" Version="2.2.0" />
28-
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
29-
</ItemGroup>
30-
31-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
32-
<Reference Include="System.Management.Automation" />
23+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(AspNetCoreVersion)" />
24+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(AspNetCoreVersion)" />
25+
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(AspNetCoreVersion)" />
26+
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="$(AspNetCoreVersion)" />
27+
<PackageReference Include="Microsoft.Net.Http.Headers" Version="$(AspNetCoreVersion)" />
28+
<PackageReference Include="System.Management.Automation.dll" Version="10.0.10586" />
3329
</ItemGroup>
3430

3531
<ItemGroup>

‎version.props

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<!-- This file may be overwritten by automation. Only values allowed here are VersionPrefix and VersionSuffix. -->
2+
<Project>
3+
<PropertyGroup>
4+
<VersionPrefix>1.2.0</VersionPrefix>
5+
<VersionSuffix>preview1</VersionSuffix>
6+
</PropertyGroup>
7+
</Project>

0 commit comments

Comments
 (0)