Merge pull request #229 from livarcocc/fix_readme_and_add_freebsd_back
Fix readme and add freebsd back
This commit is contained in:
Livar
GitHub
commit
18d88ae791
8 changed files with 28 additions and 60 deletions
17
.vsts-ci.yml
17
.vsts-ci.yml
|
|
@ -235,14 +235,15 @@ jobs:
|
|||
Build_Release:
|
||||
_BuildConfig: Release
|
||||
|
||||
# - template: /eng/build.yml
|
||||
# parameters:
|
||||
# agentOs: FreeBSD
|
||||
# queue:
|
||||
# name: Some FreeBSD queue
|
||||
# matrix:
|
||||
# Build_Release:
|
||||
# _BuildConfig: Release
|
||||
- template: /eng/build.yml
|
||||
parameters:
|
||||
agentOs: FreeBSD
|
||||
queue:
|
||||
name: dnceng-freebsd-internal
|
||||
matrix:
|
||||
Build_Release:
|
||||
_BuildConfig: Release
|
||||
_AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true'
|
||||
|
||||
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
|
||||
- job: Copy_SDK_To_Latest
|
||||
|
|
|
|||
42
README.md
42
README.md
|
|
@ -18,45 +18,11 @@ You can consult the [Documents Index for the CLI repo](https://github.com/dotnet
|
|||
|
||||
This project has adopted the code of conduct defined by the [Contributor Covenant](http://contributor-covenant.org/) to clarify expected behavior in our community. For more information, see the [.NET Foundation Code of Conduct](http://www.dotnetfoundation.org/code-of-conduct).
|
||||
|
||||
Build Status
|
||||
------------
|
||||
# Build status
|
||||
|
||||
|Windows x64|Windows x86|macOS|Linux x64 Archive|Linux arm Archive|Linux arm64 Archive|Linux Native Installers|RHEL 6 Archive|Linux-musl Archive|Windows Arm Archive|FreeBSD x64 Archive|
|
||||
|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|
|
||||
|[![][win-x64-build-badge]][win-x64-build]|[![][win-x86-build-badge]][win-x86-build]|[![][osx-build-badge]][osx-build]|[![][linux-build-badge]][linux-build]|[![][linux-arm-build-badge]][linux-arm-build]|[![][linux-arm64-build-badge]][linux-arm64-build]|[![][linuxnative-build-badge]][linuxnative-build]|[![][rhel6-build-badge]][rhel6-build]|[![][linux-musl-build-badge]][linux-musl-build]|[![][win-arm-build-badge]][win-arm-build]|[![][freebsd-x64-build-badge]][freebsd-x64-build]|
|
||||
|
||||
[win-x64-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/9472/badge
|
||||
[win-x64-build]: https://devdiv.visualstudio.com/DevDiv/_build?definitionId=9472
|
||||
|
||||
[win-x86-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/9464/badge
|
||||
[win-x86-build]: https://devdiv.visualstudio.com/DevDiv/_build?definitionId=9464
|
||||
|
||||
[osx-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/9470/badge
|
||||
[osx-build]: https://devdiv.visualstudio.com/DevDiv/_build?definitionId=9470
|
||||
|
||||
[linux-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/9469/badge
|
||||
[linux-build]: https://devdiv.visualstudio.com/DevDiv/_build?definitionId=9469
|
||||
|
||||
[linux-arm-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/9467/badge
|
||||
[linux-arm-build]: https://devdiv.visualstudio.com/DevDiv/_build?definitionId=9467
|
||||
|
||||
[linux-arm64-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/9468/badge
|
||||
[linux-arm64-build]: https://devdiv.visualstudio.com/DevDiv/_build?definitionId=9468
|
||||
|
||||
[linuxnative-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/9465/badge
|
||||
[linuxnative-build]: https://devdiv.visualstudio.com/DevDiv/_build?definitionId=9465
|
||||
|
||||
[rhel6-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/9471/badge
|
||||
[rhel6-build]: https://devdiv.visualstudio.com/DevDiv/_build?definitionId=9471
|
||||
|
||||
[linux-musl-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/9466/badge
|
||||
[linux-musl-build]: https://devdiv.visualstudio.com/DevDiv/_build?definitionId=9466
|
||||
|
||||
[win-arm-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/10417/badge
|
||||
[win-arm-build]: https://devdiv.visualstudio.com/DevDiv/_build?definitionId=10417
|
||||
|
||||
[freebsd-x64-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/10516/badge
|
||||
[freebsd-x64-build]: https://devdiv.visualstudio.com/DevDiv/_build?definitionId=10516
|
||||
|All legs|
|
||||
|:------:|
|
||||
|[](https://dev.azure.com/dnceng/internal/_build?definitionId=286)|
|
||||
|
||||
|
||||
Installers and Binaries
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ phases:
|
|||
env:
|
||||
DropSuffix: $(_DropSuffix)
|
||||
|
||||
- ${{ if eq(parameters.agentOs, 'Darwin') }}:
|
||||
- ${{ if or(eq(parameters.agentOs, 'Darwin'), eq(parameters.agentOs, 'FreeBSD')) }}:
|
||||
- script: ./build.sh
|
||||
$(TestParameter)
|
||||
--pack --publish --ci
|
||||
|
|
@ -110,6 +110,7 @@ phases:
|
|||
$(_PublishArgs)
|
||||
$(_SignArgs)
|
||||
$(_OfficialBuildIdArgs)
|
||||
$(AdditionalBuildParameters)
|
||||
displayName: Build
|
||||
|
||||
- task: PublishTestResults@1
|
||||
|
|
|
|||
|
|
@ -13,7 +13,9 @@ function InitializeCustomSDKToolset {
|
|||
#InstallDotNetSharedFramework "1.1.2"
|
||||
|
||||
InitializeDotNetCli true
|
||||
# Install 2.1 framework for dotnet-deb-tool
|
||||
# Install 2.1 framework for dotnet-deb-tool.
|
||||
# Failures on this call will be ignored, as this is expected to fail on some
|
||||
# OSes.
|
||||
InstallDotNetSharedFramework "2.1.0"
|
||||
}
|
||||
|
||||
|
|
@ -27,13 +29,7 @@ function InstallDotNetSharedFramework {
|
|||
GetDotNetInstallScript "$dotnet_root"
|
||||
local install_script=$_GetDotNetInstallScript
|
||||
|
||||
bash "$install_script" --version $version --install-dir "$dotnet_root" --runtime "dotnet"
|
||||
local lastexitcode=$?
|
||||
|
||||
if [[ $lastexitcode != 0 ]]; then
|
||||
echo "Failed to install Shared Framework $version to '$dotnet_root' (exit code '$lastexitcode')."
|
||||
ExitWithExitCode $lastexitcode
|
||||
fi
|
||||
bash "$install_script" --version $version --install-dir "$dotnet_root" --runtime "dotnet" || true
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"tools": {
|
||||
"dotnet": "3.0.100-alpha1-009697"
|
||||
"dotnet": "3.0.100-preview-009812"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.18620.6"
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<DotnetExtensionsBlobRootUrl Condition="'$(DotnetExtensionsBlobRootUrl)' == ''">https://dotnetcli.blob.core.windows.net/dotnet/</DotnetExtensionsBlobRootUrl>
|
||||
|
||||
<CoreSetupRid>$(HostRid)</CoreSetupRid>
|
||||
<CoreSetupRid Condition=" ('$(HostOSName)' == 'win' or '$(HostOSName)' == 'osx') and '$(DotNetBuildFromSource)' != 'true' ">$(HostMonikerRid)</CoreSetupRid>
|
||||
<CoreSetupRid Condition=" ('$(HostOSName)' == 'win' or '$(HostOSName)' == 'osx' or '$(HostOSName)' == 'freebsd') and '$(DotNetBuildFromSource)' != 'true' ">$(HostMonikerRid)</CoreSetupRid>
|
||||
|
||||
<!-- only the runtime OSX .pkgs have a `-internal` suffix -->
|
||||
<InstallerStartSuffix Condition="'$(HostOSName)' == 'osx'">-internal</InstallerStartSuffix>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
</GetCurrentRuntimeInformation>
|
||||
|
||||
<PropertyGroup>
|
||||
<IsLinux Condition = " '$(HostOSName)' != 'win' AND '$(HostOSName)' != 'osx' ">True</IsLinux>
|
||||
<IsLinux Condition = " '$(HostOSName)' != 'win' AND '$(HostOSName)' != 'osx' AND '$(HostOSName)' != 'freebsd' ">True</IsLinux>
|
||||
<OSName Condition=" '$(OSName)' == '' AND '$(IsLinux)' != 'True' ">$(HostOSName)</OSName>
|
||||
<OSPlatform Condition=" '$(OSPlatform)' == '' AND '$(IsLinux)' != 'True' ">$(HostOSPlatform)</OSPlatform>
|
||||
<OSName Condition=" '$(OSName)' == '' AND '$(IsLinux)' == 'True' ">linux</OSName>
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
<!--<IncludeNuGetPackageArchive Condition=" '$(IncludeNuGetPackageArchive)' == '' ">true</IncludeNuGetPackageArchive>-->
|
||||
<SkipBuildingInstallers Condition=" '$(SkipBuildingInstallers)' == '' AND
|
||||
($(Rid.StartsWith('rhel.6'))
|
||||
OR $(Rid.StartsWith('freebsd'))
|
||||
OR $(Rid.StartsWith('linux-musl'))
|
||||
OR $(Rid.StartsWith('fedora.27'))
|
||||
OR $(Rid.StartsWith('opensuse.42.3'))
|
||||
|
|
@ -23,6 +24,9 @@
|
|||
AND '$(Rid)' != 'ubuntu.18.04-x64'">true</IncludeSharedFrameworksForBackwardsCompatibilityTests>-->
|
||||
<HighEntropyVA>true</HighEntropyVA>
|
||||
|
||||
<!-- There is no asp.net runtime available for freebsd at the moment. Once there is one, we can remove the line below -->
|
||||
<IncludeAspNetCoreRuntime Condition=" '$(IncludeAspNetCoreRuntime)' == '' AND $(Rid.StartsWith('freebsd'))">false</IncludeAspNetCoreRuntime>
|
||||
|
||||
<!-- Only use asset target fallback that we set (not implicit one to net461). -->
|
||||
<!--<DisableImplicitAssetTargetFallback>true</DisableImplicitAssetTargetFallback>-->
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue