Skip to content

Commit

Permalink
Update infrastructure for 16.1 preview1
Browse files Browse the repository at this point in the history
  • Loading branch information
JoeRobich committed Mar 25, 2019
1 parent 68b00d5 commit 01b0ca2
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 10 deletions.
8 changes: 4 additions & 4 deletions azure-pipelines-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
trigger:
- master
- master-vs-deps
- dev16.0-preview3
- dev16.0-preview3-vs-deps
- dev16.0
- dev16.0-vs-deps
- dev16.1-preview1
- dev16.1-preview1-vs-deps

# Branches that trigger builds on PR
pr:
- master
- master-vs-deps
- features/*
- demos/*
- dev16.0-preview3
- dev16.0-preview3-vs-deps
- dev16.0
- dev16.0-vs-deps
- dev16.1-preview1
- dev16.1-preview1-vs-deps

jobs:
- job: Windows_VisualStudio_Integration_Tests
Expand Down
8 changes: 4 additions & 4 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ trigger:
- master-vs-deps
- features/*
- demos/*
- dev16.0-preview3
- dev16.0-preview3-vs-deps
- dev16.0
- dev16.0-vs-deps
- dev16.1-preview1
- dev16.1-preview1-vs-deps

# Branches that trigger builds on PR
pr:
- master
- master-vs-deps
- features/*
- demos/*
- dev16.0-preview3
- dev16.0-preview3-vs-deps
- dev16.0
- dev16.0-vs-deps
- dev16.1-preview1
- dev16.1-preview1-vs-deps

jobs:
- job: Windows_Desktop_Unit_Tests
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
-->
<PropertyGroup>
<VersionPrefix>3.1.0</VersionPrefix>
<PreReleaseVersionLabel>beta1</PreReleaseVersionLabel>
<PreReleaseVersionLabel>beta2</PreReleaseVersionLabel>
<SemanticVersioningV1>true</SemanticVersioningV1>
<!--
By default the assembly version in official builds is "$(VersionPrefix).0".
Expand Down
11 changes: 10 additions & 1 deletion eng/config/PublishData.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,21 @@
"vsBranch": "rel/d16.0",
"vsMajorVersion": 16
},
"dev16.1-preview1-vs-deps": {
"nugetKind": ["Shipping", "NonShipping"],
"version": "3.1.*",
"nuget": [ "https://dotnet.myget.org/F/roslyn/api/v2/package" ],
"vsix": [ "https://dotnet.myget.org/F/roslyn/vsix/upload" ],
"channels": [ "dev16.1", "dev16.1p1" ],
"vsBranch": "rel/d16.1",
"vsMajorVersion": 16
},
"master-vs-deps": {
"nugetKind": ["Shipping", "NonShipping"],
"version": "3.1.*",
"nuget": [ "https://dotnet.myget.org/F/roslyn/api/v2/package" ],
"vsix": [ "https://dotnet.myget.org/F/roslyn/vsix/upload" ],
"channels": [ "dev16.1", "dev16.1p1" ],
"channels": [ "dev16.1", "dev16.1p2" ],
"vsBranch": "lab/d16.1stg",
"vsMajorVersion": 16
},
Expand Down

0 comments on commit 01b0ca2

Please sign in to comment.