Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

housekeeping: Now use azure templates to keep builds consistent #1954

Merged
merged 13 commits into from
Mar 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 0 additions & 81 deletions azure-pipelines-tests.yml

This file was deleted.

109 changes: 10 additions & 99 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,103 +8,14 @@ pr:
- rel/*
- preview/*

jobs:
- job: Windows
pool:
vmImage: vs2017-win2016

steps:
- task: DotNetCoreInstaller@0
displayName: Install Dot Net Core v2.2.1
inputs:
version: '2.2.103'

- task: BatchScript@1
inputs:
filename: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\Common7\\Tools\\VsDevCmd.bat"
arguments: -no_logo
modifyEnvironment: true
displayName: Setup Environment Variables

- powershell: .\build.ps1
displayName: Build
env:
SIGNCLIENT_SECRET: $(SignClientSecret)
SIGNCLIENT_USER: $(SignClientUser)
CODECOV_TOKEN: $(CODECOV_TOKEN)
ArtifactDirectory: $(System.DefaultWorkingDirectory)\Artifacts

- task: PublishTestResults@2
displayName: Publish Test Results
inputs:
testResultsFormat: 'VSTest'
testResultsFiles: '**\testresults.trx'
searchFolder: '$(System.DefaultWorkingDirectory)\artifacts\tests'

- task: PublishCodeCoverageResults@1
displayName: Publish Coverage Results
inputs:
codeCoverageTool: 'cobertura'
summaryFileLocation: 'artifacts\tests\Report\Cobertura.xml'
reportDirectory: 'artifacts\tests\Report'

- task: CopyFiles@2
inputs:
Contents: 'artifacts/packages/*.nupkg'
TargetFolder: '$(build.artifactstagingdirectory)\packages'
flattenFolders: true

- task: PublishBuildArtifacts@1
displayName: Publish Package Build Artifacts
inputs:
pathToPublish: '$(build.artifactstagingdirectory)\packages'
artifactType: container
artifactName: Packages
resources:
repositories:
- repository: templates
type: github
name: ReactiveUI/ReactiveUI.Cake.Recipe
endpoint: reactiveui

- task: CopyFiles@2
inputs:
Contents: 'artifacts/binaries/**/*'
TargetFolder: '$(build.artifactstagingdirectory)\binaries'

- task: PublishBuildArtifacts@1
displayName: Publish Binaries Build Artifacts
inputs:
pathToPublish: '$(build.artifactstagingdirectory)\binaries'
artifactType: container
artifactName: Binaries

- task: CopyFiles@2
inputs:
Contents: 'artifacts/tests/**/*'
TargetFolder: '$(build.artifactstagingdirectory)\tests'

- task: PublishBuildArtifacts@1
displayName: Publish Test Results Build Artifacts
inputs:
pathToPublish: '$(build.artifactstagingdirectory)\tests'
artifactType: container
artifactName: Tests

- task: CopyFiles@2
inputs:
Contents: 'artifacts/Events/*.cs'
TargetFolder: '$(build.artifactstagingdirectory)\Events'

- task: PublishBuildArtifacts@1
displayName: Publish Generated Events
inputs:
pathToPublish: '$(build.artifactstagingdirectory)\Events'
artifactType: container
artifactName: Events

- job: Mac
pool:
vmImage: 'macOS-10.13'
steps:
- task: DotNetCoreInstaller@0
displayName: Install Dot Net Core v2.2.103
inputs:
version: '2.2.103'

- bash: ./build.sh --target=Build
displayName: Build
jobs:
- template: Azure/azure-pipelines.yml@templates # Template reference
parameters:
eventsGenerated: true
2 changes: 1 addition & 1 deletion build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#load nuget:https://www.myget.org/F/reactiveui/api/v2?package=ReactiveUI.Cake.Recipe&prerelease
#load nuget:https://www.myget.org/F/reactiveui/?package=ReactiveUI.Cake.Recipe&prerelease

const string project = "ReactiveUI";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,11 @@ namespace ReactiveUI
{
ReactiveUI.RoutingState Router { get; }
}
public interface ISetMethodBindingConverter : Splat.IEnableLogger
{
int GetAffinityForObjects(System.Type fromType, System.Type toType);
object PerformSet(object toTarget, object newValue, object[] arguments);
}
public interface ISupportsActivation
{
ReactiveUI.ViewModelActivator Activator { get; }
Expand Down
Loading