diff --git a/.build/build.targets b/.build/_build.targets similarity index 100% rename from .build/build.targets rename to .build/_build.targets diff --git a/.nuget/packages.config b/.nuget/packages.config deleted file mode 100644 index 65f4cae..0000000 --- a/.nuget/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/MyLib/MyLib.csproj b/MyLib/MyLib.csproj index a10a397..4503985 100644 --- a/MyLib/MyLib.csproj +++ b/MyLib/MyLib.csproj @@ -58,14 +58,16 @@ - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + - + - - 1.0.0 - - diff --git a/MyLib/MyLib.v2.ncrunchproject b/MyLib/MyLib.v2.ncrunchproject new file mode 100644 index 0000000..cdfbdeb Binary files /dev/null and b/MyLib/MyLib.v2.ncrunchproject differ diff --git a/MyLib/packages.config b/MyLib/packages.config index 95b328e..0e8a45e 100644 --- a/MyLib/packages.config +++ b/MyLib/packages.config @@ -1,6 +1,6 @@  - + diff --git a/OneClickBuild.sln b/OneClickBuild.sln index a7f8558..94a72f4 100644 --- a/OneClickBuild.sln +++ b/OneClickBuild.sln @@ -23,6 +23,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".build", ".build", "{73075679-9D33-4F3E-8ED4-73261F88F90B}" ProjectSection(SolutionItems) = preProject build.bat = build.bat + .build\OneClickBuild.targets = .build\OneClickBuild.targets EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneClickBuild", "OneClickBuild\OneClickBuild.csproj", "{02B527C6-BE5E-4245-8B08-6D11E5825986}" diff --git a/OneClickBuild/build/OneClickBuild.targets b/OneClickBuild/build/OneClickBuild.targets index ae9d01b..fd0170b 100644 --- a/OneClickBuild/build/OneClickBuild.targets +++ b/OneClickBuild/build/OneClickBuild.targets @@ -1,7 +1,7 @@  - + @@ -18,7 +18,6 @@ - $(SolutionDir).build $(OutDir)$(AssemblyName).exe $(OutDir)$(AssemblyName).dll $(SolutionDir)testresults\ @@ -46,16 +45,26 @@ + + + + + - + + + $(GitVersion_MajorMinorPatch).$(Build) + $(GitVersion_Sha) + + + Command="nuget pack $(NuspecFile) -Properties Version=$(PackageVersion);Revision=$(Revision);Configuration=$(Configuration)"/> - $(ProjectName.$(NuGetVersionV2).nupkg) + $(ProjectName.$(GitVersion_MajorMinorPatch).$(Build).nupkg @@ -133,9 +142,6 @@ - - - diff --git a/OneClickBuild/tools/VersionInfo.g.cs b/OneClickBuild/tools/VersionInfo.g.cs deleted file mode 100644 index d035ffd..0000000 --- a/OneClickBuild/tools/VersionInfo.g.cs +++ /dev/null @@ -1,15 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.34209 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -[assembly: System.Reflection.AssemblyVersion("1.0.0.0")] -[assembly: System.Reflection.AssemblyFileVersion("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersion("1.0.0.0.xxxxxxx")] - - diff --git a/OneClickBuild/tools/solution.targets b/OneClickBuild/tools/solution.targets index 5eb5749..78c381a 100644 --- a/OneClickBuild/tools/solution.targets +++ b/OneClickBuild/tools/solution.targets @@ -1,18 +1,10 @@  - - - 1.0.0.$(Build) - - Properties\SolutionInfo.cs - - Properties\VersionInfo.g.cs -