Skip to content

Commit

Permalink
Merge branch 'Development'
Browse files Browse the repository at this point in the history
Conflicts:
	README.md
	development.md
  • Loading branch information
wald-tq committed Jul 10, 2015
2 parents 14acd10 + 22958d0 commit 8383d04
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 3 deletions.
1 change: 1 addition & 0 deletions Intertech.Validation/Intertech.Validation.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
<Compile Include="ValidationHelper.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Intertech.Validation.nuspec" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
17 changes: 17 additions & 0 deletions Intertech.Validation/Intertech.Validation.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0"?>
<package >
<metadata>
<id>$id$</id>
<version>$version$</version>
<title>$title$</title>
<authors>$author$</authors>
<owners>$author$</owners>
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
<projectUrl>https://github.com/IntertechInc/aa-validation-from-server</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>$description$</description>
<releaseNotes>Summary of changes made in this release of the package.</releaseNotes>
<copyright>Copyright 2015</copyright>
<tags>Intertech validation AngularAgility form external configuration api</tags>
</metadata>
</package>
2 changes: 1 addition & 1 deletion Intertech.Validation/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
[assembly: AssemblyTitle("Intertech.Validation")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyCompany("Intertech, Inc")]
[assembly: AssemblyProduct("Intertech.Validation")]
[assembly: AssemblyCopyright("Copyright © 2014")]
[assembly: AssemblyTrademark("")]
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,5 +143,3 @@ The controller now can inject validationData since it was resolved in the router
## Contributing

See file [development.md](development.md) for more infos on the project structure.

TODO: What are the guidelines for contributions?
6 changes: 6 additions & 0 deletions development.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,11 @@ TODO:
### Intertech.Validation
The actual source of the library.

#### Build the NuGet Package

```
.nuget\NuGet.exe pack Intertech.Validation\Intertech.Validation.csproj
```

### Intertech.Validation.Test
The test-project with backend unit-tests

0 comments on commit 8383d04

Please sign in to comment.