Skip to content

Commit 871ef16

Browse files
committed
Get publish-nuget.ps1 working again
1 parent d2f8a3a commit 871ef16

File tree

5 files changed

+25
-4
lines changed

5 files changed

+25
-4
lines changed

Build/Griddly.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<projectUrl>http://griddly.com</projectUrl>
1010
<iconUrl>https://raw.githubusercontent.com/programcsharp/griddly/master/Griddly/Content/griddly-32.png</iconUrl>
1111
<requireLicenseAcceptance>false</requireLicenseAcceptance>
12-
<license type="expression">MIT</license>
12+
<!--<license type="expression">MIT</license>-->
1313
<description>Pagable, sortable, MVC enabled grid</description>
1414
<!--<summary></summary>-->
1515
<language>en-US</language>

Build/build.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PackageDir>$(BuildDir)\Packages</PackageDir>
88
<SolutionFile>$(BaseDir)\Griddly.sln</SolutionFile>
99
<MSBuildExtensions>$(BaseDir)\.build\MSBuild.Community.Tasks.dll</MSBuildExtensions>
10-
<VisualStudioVersion>14.0</VisualStudioVersion>
10+
<VisualStudioVersion>16.0</VisualStudioVersion>
1111
</PropertyGroup>
1212

1313
<UsingTask AssemblyFile="$(MSBuildExtensions)" TaskName="MSBuild.Community.Tasks.XmlUpdate" />
@@ -23,7 +23,7 @@
2323
<RemoveDir Directories="$(BaseDir)\Griddly\obj" />
2424

2525
<ItemGroup>
26-
<Libs Include="$(BaseDir)\Griddly.Mvc\bin\$(Configuration)\Griddly.Mvc.dll" />
26+
<Libs Include="$(BaseDir)\Griddly.Mvc\bin\$(Configuration)\net45\Griddly.Mvc.dll" />
2727
<Content Include="$(BaseDir)\Griddly\**\griddly.js" />
2828
<Content Include="$(BaseDir)\Griddly\**\griddly.css" />
2929
<Content Include="$(BaseDir)\Griddly\**\Views\Shared\Griddly\*.*" />

Build/publish-nuget.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ if(-not (test-path $keyfile)) {
2727
else {
2828
pushd $packagespath
2929

30-
# get our secret key. This is not in the repository.
30+
# get our secret key. This is not in the repository.
3131
$key = get-content $keyfile
3232

3333
# Find all the packages and display them for confirmation

Griddly.Mvc/Griddly.Mvc.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<PropertyGroup>
44
<TargetFrameworks>netcoreapp3.1;net45</TargetFrameworks>
55
<RootNamespace>Griddly.Mvc</RootNamespace>
6+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
67
</PropertyGroup>
78

89
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
using System.Reflection;
2+
using System.Runtime.InteropServices;
3+
4+
[assembly: AssemblyProduct("Griddly")]
5+
[assembly: AssemblyCopyright("Copyright © 2013-2020 Chris Hynes, Joel Potter, and Data Research Group")]
6+
7+
[assembly: ComVisible(false)]
8+
9+
// Version information for an assembly consists of the following four values:
10+
//
11+
// Major Version
12+
// Minor Version
13+
// Build Number
14+
// Revision
15+
//
16+
// You can specify all the values or you can default the Revision and Build Numbers
17+
// by using the '*' as shown below:
18+
[assembly: AssemblyVersion("3.2.18")]
19+
[assembly: AssemblyFileVersion("3.2.18")]
20+
//[assembly: AssemblyInformationalVersion("2.5-filters")]

0 commit comments

Comments
 (0)