Skip to content

Commit

Permalink
Updated build process
Browse files Browse the repository at this point in the history
  • Loading branch information
ravensorb committed May 20, 2018
1 parent a3994ac commit 72e1f6a
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ tools/**

# GIT
git.password
nugetapi.key
nugetapi.key

# Python Tools for Visual Studio (PTVS)
__pycache__/
Expand Down
14 changes: 8 additions & 6 deletions build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -281,16 +281,18 @@ Task("Nuget-Publish")
settings.NuGet.FeedApiKey = System.IO.File.ReadAllText("nugetapi.key");
}
foreach (var n in nupkgFiles)
{
try
{
NuGetPush(n, new NuGetPushSettings {
var nugetSettings = new NuGetPushSettings {
Source = settings.NuGet.FeedUrl,
ApiKey = settings.NuGet.FeedApiKey,
ConfigFile = settings.NuGet.NuGetConfig,
Verbosity = NuGetVerbosity.Normal
});
};
foreach (var n in nupkgFiles)
{
try
{
NuGetPush(n, nugetSettings);
}
catch (Exception ex)
{
Expand Down
6 changes: 3 additions & 3 deletions build.settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
"Framework": "NUnit3"
},
"nuget": {
"NuGetConfig": "./.nuget/NuGet.config",
"FeedUrl": "https://www.nuget.com",
"FeedAPIKey": "[NUGETAPIKEY]",
"NuGetConfig": "./src/.nuget/NuGet.config",
"FeedUrl": "https://api.nuget.org/v3/index.json",
"FeedAPIKey": "NUGETAPIKEY",
"ArtifactsPath": "./artifacts/packages",
"NuspecPath": "./nuspec",
"UpdateVersion": true,
Expand Down
2 changes: 1 addition & 1 deletion build.version.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"Major":1,"Minor":0,"Build":0,"PreRelease":0,"ReleaseNotes":null,"Semantic":null,"Milestone":null,"CakeVersion":"0.27.2.0","IsPreRelease":false}
{"Major":1,"Minor":1,"Build":5,"PreRelease":0,"ReleaseNotes":null,"Semantic":null,"Milestone":null,"CakeVersion":"0.27.2.0","IsPreRelease":false}
2 changes: 1 addition & 1 deletion nuspec/Invisionware.Collections.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>Invisionware.Collections</id>
<version>1.0.0</version>
<version>1.1.5</version>
<title>Invisionware.Collections</title>
<authors>Invisionware</authors>
<owners>Invisionware</owners>
Expand Down
3 changes: 1 addition & 2 deletions src/.nuget/NuGet.Config
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
<add key="disableSourceControlIntegration" value="true" />
</solution>
<packageSources>
<add key="nuget.org (v2)" value="https://www.nuget.org/api/v2/" />
<!-- add key="nuget.org (v3)" value="https://api.nuget.org/v3/index.json" protocolVersion="3" -->
<add key="nuget.org (v3)" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
</packageSources>
<disabledPackageSources />
<activePackageSource>
Expand Down
4 changes: 2 additions & 2 deletions src/AssemblyInfo.Shared.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.0")]
//[assembly: AssemblyFileVersion("1.0.0")]
[assembly: AssemblyVersion("1.1.5")]
//[assembly: AssemblyFileVersion("1.1.5")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
Expand Down

0 comments on commit 72e1f6a

Please sign in to comment.