Skip to content

Commit 33d7125

Browse files
aldomsaldoms
authored
Merge pull request #14 from Microsoft/users/aldoms/tarball
Users/aldoms/tarball
2 parents 88bc9c6 + a16736c commit 33d7125

File tree

9 files changed

+54
-27
lines changed

9 files changed

+54
-27
lines changed

‎.vsts-ci.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
resources:
22
- repo: self
3+
34
queue:
45
demands: msbuild
56

7+
trigger:
8+
- master
9+
610
variables:
711
BuildConfiguration: 'Debug'
12+
PushNupkg: 'True'
813
TeamName: 'Package Experience'
914

1015
steps:
1116
- template: build/build.yml
1217
parameters:
13-
push: true
1418
nuspecProperties: 'VersionSuffix=-CI-$(Build.BuildNumber)'

‎.vsts-pr.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
resources:
22
- repo: self
3+
34
queue:
45
demands: msbuild
56

7+
trigger: none
8+
69
variables:
710
BuildConfiguration: 'Debug'
811
TeamName: 'Package Experience'
912

1013
steps:
1114
- template: build/build.yml
1215
parameters:
13-
push: false
1416
nuspecProperties: 'VersionSuffix=-PR-$(Build.BuildNumber)'

‎.vsts-release.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,18 @@ resources:
44
queue:
55
demands: msbuild
66

7+
trigger: none
8+
79
variables:
810
BuildConfiguration: 'Release'
911
TeamName: 'Package Experience'
1012

1113
steps:
14+
- checkout: self
15+
clean: true
1216
- powershell: 'mkdir $(Build.SourcesDirectory)\keys; cp -Verbose $(KeyLocation) $(Build.SourcesDirectory)\keys\; dir $(Build.SourcesDirectory)\keys\'
1317
displayName: Copy public key
1418

1519
- template: build/build.yml
1620
parameters:
17-
push: false
1821
sign: true

‎CredentialProvider.Microsoft.VSIX/Microsoft.CredentialProvider.swixproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props" />
44

55
<PropertyGroup>
6-
<ProductVersion>0.1.0</ProductVersion>
6+
<ProductVersion>0.1.1</ProductVersion>
77
<ProjectGuid>4966bd57-3289-44a3-9698-f750a35b726b</ProjectGuid>
88
<SchemaVersion>2.0</SchemaVersion>
99
<OutputArchitecture>neutral</OutputArchitecture>

‎CredentialProvider.Microsoft.VSIX/Microsoft.CredentialProvider.swr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use vs
22

33
package name=Microsoft.CredentialProvider
4-
version=0.1.0
4+
version=0.1.1
55

6-
folder InstallDir:\Common7\IDE\CommonExtensions\Microsoft\NuGet\Plugins\MicrosoftCredentialProvider
6+
folder InstallDir:\Common7\IDE\CommonExtensions\Microsoft\NuGet\Plugins\CredentialProvider.Microsoft
77
file source=$(PluginBinPath)\CredentialProvider.Microsoft.exe
88
file source=$(PluginBinPath)\CredentialProvider.Microsoft.exe.config
99
file source=$(PluginBinPath)\CredentialProvider.Microsoft.pdb

‎CredentialProvider.Microsoft/CredentialProvider.Microsoft.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
66
<LangVersion>latest</LangVersion>
77
<ApplicationIcon>helpericons.ico</ApplicationIcon>
8-
<Version>0.1.0</Version>
8+
<Version>0.1.1</Version>
99
</PropertyGroup>
1010

1111
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

‎CredentialProvider.Microsoft/CredentialProvider.Microsoft.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package>
33
<metadata>
44
<id>Microsoft.NuGet.CredentialProvider</id>
5-
<version>0.1.0$VersionSuffix$</version>
5+
<version>0.1.1$VersionSuffix$</version>
66
<title>Microsoft Credential Provider for NuGet</title>
77
<authors>Microsoft</authors>
88
<owners>microsoft,nugetvss</owners>

‎README.md‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# MicrosoftCredentialProvider
22

33
## Status
4-
| | Build & Test |
5-
|-|--------------|
6-
| **Windows** | [![Build status](https://mseng.visualstudio.com/_apis/public/build/definitions/b924d696-3eae-4116-8443-9a18392d8544/7110/badge)](https://mseng.visualstudio.com/VSOnline/_build/latest?definitionId=7110) |
4+
| | Build & Test | MSCredProvider |
5+
|--------------------|--------------|----------------|
6+
| **Windows** |[![Build status](https://mseng.visualstudio.com/_apis/public/build/definitions/b924d696-3eae-4116-8443-9a18392d8544/7110/badge?branchName=master)](https://mseng.visualstudio.com/VSOnline/_build/latest?definitionId=7110&branch=master)| [![Microsoft.NuGet.CredentialProvider package in MSCredProvider feed in Visual Studio Team Services](https://mseng.feeds.visualstudio.com/_apis/public/Packaging/Feeds/54754426-96db-4f6e-8a3a-64265d1cc147/Packages/16200823-3f36-4334-a4ec-7b7b6cd5243d/Badge)](https://mseng.visualstudio.com/_Packaging?feed=54754426-96db-4f6e-8a3a-64265d1cc147&package=16200823-3f36-4334-a4ec-7b7b6cd5243d&preferRelease=true&_a=package) |
77

88
The configuration parameter in the examples below can be either Debug or Release
99

@@ -21,18 +21,12 @@ For CI builds, you can append a pre-release version
2121
dotnet pack CredentialProvider.Microsoft --configuration Release /p:NuspecFile=CredentialProvider.Microsoft.nuspec /p:NuspecProperties=VersionSuffix=-MyCustomVersion-2
2222
```
2323

24-
# MicrosoftCredentialProvider VSIX
25-
## Building
26-
Build the solution in Visual Studio 2017, or using msbuild:
27-
```
28-
msbuild MicrosoftCredentialProvider.sln /p:Configuration=Release /t:restore,build
29-
```
30-
3124
# Versioning
3225
Update the following files when modifying the version:
3326
- CredentialProvider.Microsoft\CredentialProvider.Microsoft.csproj
3427
- CredentialProvider.Microsoft\CredentialProvider.Microsoft.nuspec
35-
- MicrosoftCredentialProviderVSIX\bin\Debug\extension.vsixmanifest
28+
- CredentialProvider.Microsoft.VSIX\Microsoft.CredentialProvider.swixproj
29+
- CredentialProvider.Microsoft.VSIX\Microsoft.CredentialProvider.swr
3630

3731
# Contributing
3832

‎build/build.yml‎

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
parameters:
2-
push: false
32
sign: false
43
nuspecProperties: ''
54

@@ -85,13 +84,38 @@ steps:
8584
packDestination: '$(Build.ArtifactStagingDirectory)\$(BuildConfiguration)'
8685
buildProperties: '${{ parameters.nuspecProperties }}'
8786

88-
- ${{ if eq(parameters.push, 'true') }}:
89-
- task: DotNetCoreCLI@2
90-
displayName: dotnet push
91-
inputs:
92-
command: push
93-
packagesToPush: '$(Build.ArtifactStagingDirectory)/$(BuildConfiguration)/*.nupkg'
94-
publishVstsFeed: '54754426-96db-4f6e-8a3a-64265d1cc147'
87+
- task: DotNetCoreCLI@2
88+
displayName: dotnet push
89+
inputs:
90+
command: push
91+
packagesToPush: '$(Build.ArtifactStagingDirectory)/$(BuildConfiguration)/*.nupkg'
92+
publishVstsFeed: '54754426-96db-4f6e-8a3a-64265d1cc147'
93+
condition: eq(variables['PushNupkg'], 'true')
94+
95+
- task: CopyFiles@2
96+
displayName: Copy netfx files into tarball
97+
inputs:
98+
sourceFolder: '$(Build.SourcesDirectory)\CredentialProvider.Microsoft\bin\$(BuildConfiguration)\net461\'
99+
contents: '**\*'
100+
targetFolder: '$(Build.ArtifactStagingDirectory)\tarball\plugins\netfx\CredentialProvider.Microsoft\'
101+
cleanTargetFolder: true
102+
103+
- task: CopyFiles@2
104+
displayName: Copy netcore files into tarball
105+
inputs:
106+
sourceFolder: '$(Build.SourcesDirectory)\CredentialProvider.Microsoft\bin\$(BuildConfiguration)\netcoreapp2.1\publish\'
107+
Contents: '**\*'
108+
targetFolder: '$(Build.ArtifactStagingDirectory)\tarball\plugins\netcore\CredentialProvider.Microsoft\'
109+
110+
- task: ArchiveFiles@2
111+
displayName: Create tarball
112+
inputs:
113+
rootFolderOrFile: '$(Build.ArtifactStagingDirectory)\tarball\'
114+
includeRootFolder: false
115+
archiveType: 'tar'
116+
tarCompression: 'gz'
117+
archiveFile: '$(Build.ArtifactStagingDirectory)\$(BuildConfiguration)\Microsoft.NuGet.CredentialProvider.tar.gz'
118+
replaceExistingArchive: true
95119

96120
- task: PublishBuildArtifacts@1
97121
displayName: Publish Artifact $(Build.BuildNumber)

0 commit comments

Comments
 (0)