Merge branch 'master' into rel/3.0.0-preview
This commit is contained in:
Коммит
1ff23ff89b
|
@ -18,6 +18,13 @@ steps:
|
||||||
inputs:
|
inputs:
|
||||||
versionSpec: 4.6.2
|
versionSpec: 4.6.2
|
||||||
|
|
||||||
|
- task: DotNetCoreCLI@2
|
||||||
|
inputs:
|
||||||
|
command: build
|
||||||
|
projects: build/setversion.csproj
|
||||||
|
arguments: -c $(BuildConfiguration)
|
||||||
|
displayName: Set Version
|
||||||
|
|
||||||
- powershell: |
|
- powershell: |
|
||||||
.\build\build.ps1 -target=SignNuGet
|
.\build\build.ps1 -target=SignNuGet
|
||||||
displayName: Build
|
displayName: Build
|
||||||
|
|
|
@ -17,7 +17,6 @@ steps:
|
||||||
- powershell: |
|
- powershell: |
|
||||||
.\build\build.ps1 -target=Build
|
.\build\build.ps1 -target=Build
|
||||||
displayName: Build
|
displayName: Build
|
||||||
|
|
||||||
|
|
||||||
- task: PublishBuildArtifacts@1
|
- task: PublishBuildArtifacts@1
|
||||||
displayName: Publish Package Artifacts
|
displayName: Publish Package Artifacts
|
||||||
|
@ -25,4 +24,4 @@ steps:
|
||||||
pathToPublish: .\bin\nupkg
|
pathToPublish: .\bin\nupkg
|
||||||
artifactType: container
|
artifactType: container
|
||||||
artifactName: Packages
|
artifactName: Packages
|
||||||
condition: always()
|
condition: eq(variables['system.pullrequest.isfork'], false)
|
|
@ -0,0 +1,7 @@
|
||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>netstandard2.0</TargetFramework>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
</Project>
|
|
@ -0,0 +1,8 @@
|
||||||
|
{
|
||||||
|
"inherit": true,
|
||||||
|
"cloudBuild": {
|
||||||
|
"buildNumber": {
|
||||||
|
"enabled": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -10,7 +10,7 @@
|
||||||
},
|
},
|
||||||
"cloudBuild": {
|
"cloudBuild": {
|
||||||
"buildNumber": {
|
"buildNumber": {
|
||||||
"enabled": true
|
"enabled": false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче