Merge remote-tracking branch 'origin/rel/2.0.0-preview2' into dev
This commit is contained in:
commit
06db90cbfa
|
|
@ -16,6 +16,7 @@ branches:
|
|||
- release
|
||||
- dev
|
||||
- /^(.*\/)?ci-.*$/
|
||||
- /^rel\/.*/
|
||||
before_install:
|
||||
- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/; fi
|
||||
script:
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ branches:
|
|||
- release
|
||||
- dev
|
||||
- /^(.*\/)?ci-.*$/
|
||||
- /^rel\/.*/
|
||||
build_script:
|
||||
- ps: .\build.ps1
|
||||
clone_depth: 1
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
<AspNetCoreVersion>2.0.0-*</AspNetCoreVersion>
|
||||
<AspNetCoreIntegrationTestingVersion>0.4.0-*</AspNetCoreIntegrationTestingVersion>
|
||||
<InternalAspNetCoreSdkVersion>2.1.0-*</InternalAspNetCoreSdkVersion>
|
||||
<NETStandardImplicitPackageVersion>2.0.0-*</NETStandardImplicitPackageVersion>
|
||||
<NETStandardLibraryNETFrameworkVersion>2.0.0-*</NETStandardLibraryNETFrameworkVersion>
|
||||
<RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0-*</RuntimeFrameworkVersion>
|
||||
<TestSdkVersion>15.3.0-*</TestSdkVersion>
|
||||
|
|
|
|||
|
|
@ -25,6 +25,8 @@
|
|||
<ItemGroup>
|
||||
<None Include="build\common.targets" Pack="true" PackagePath="%(Identity)" />
|
||||
<None Include="lib\net461\_._" Pack="true" PackagePath="%(Identity)" />
|
||||
<None Include="lib\netcoreapp2.0\_._" Pack="true" PackagePath="runtimes\win7-x64\lib\netcoreapp2.0\_._" />
|
||||
<None Include="lib\netcoreapp2.0\_._" Pack="true" PackagePath="runtimes\win7-x86\lib\netcoreapp2.0\_._" />
|
||||
<None Include="build\netcoreapp2.0\*" Pack="true" PackagePath="%(Identity)" />
|
||||
<None Include="bin\$(Configuration)\netcoreapp2.0\$(AssemblyName).dll" Pack="true" PackagePath="lib\netcoreapp2.0\$(AssemblyName).dll" />
|
||||
<None Include="bin\$(Configuration)\netcoreapp2.0\$(AssemblyName).runtimeconfig.json" Pack="true" PackagePath="lib\netcoreapp2.0\$(AssemblyName).runtimeconfig.json" />
|
||||
|
|
|
|||
Loading…
Reference in New Issue