Permalink
Browse files

updated build to build to artifacts/editorconfig-BUILDVERSION.vsix

  • Loading branch information...
1 parent af464dc commit 48224f1d29f21fb2bd037d4efa6dcbf6ea34dfba @Mpdreamz Mpdreamz committed Mar 14, 2016
View
@@ -39,9 +39,7 @@ let tags = "editor, code editor, text editor, tabs, whitespace, indentation, new
// File system information
// (<solutionFile>.sln is built during the building process)
-let solutionFile = "EditorConfig.VisualStudio"
-// Pattern specifying assemblies to be tested using NUnit
-let testAssemblies = "tests/**/bin/Release/*Tests*.dll"
+let solutionFile = "src/EditorConfig.VisualStudio.sln"
// Git configuration (used for publishing documentation in gh-pages branch)
// The profile where the project is posted
@@ -58,10 +56,8 @@ let release = parseReleaseNotes (IO.File.ReadAllLines "release-notes.md")
let isAppVeyorBuild = environVar "APPVEYOR" <> null
let buildVersion = sprintf "%s-a%s" release.NugetVersion (DateTime.UtcNow.ToString "yyMMddHHmm")
-let buildDir = "bin"
-let vsixDir = "bin/vsix"
-let tempDir = "temp"
-let buildMergedDir = buildDir @@ "merged"
+let buildDir = "artifacts"
+let vsixArtifact = sprintf "%s/EditorConfig-%s.vsix" buildDir buildVersion
Target "BuildVersion" (fun _ ->
Shell.Exec("appveyor", sprintf "UpdateBuild -Version \"%s\"" buildVersion) |> ignore
@@ -76,7 +72,7 @@ Target "AssemblyInfo" (fun _ ->
Attribute.FileVersion release.AssemblyVersion ]
CreateCSharpAssemblyInfo "src/EditorConfig.VisualStudio/Properties/AssemblyInfo.cs"
- (Attribute.InternalsVisibleTo "EditorConfig.VisualStudio.Tests" :: Attribute.Title "EditorConfig.VisualStudio" :: shared)
+ (Attribute.Title "EditorConfig.VisualStudio" :: shared)
let manifest = "src/EditorConfig.VisualStudio/source.extension.vsixmanifest"
File.WriteAllLines(
@@ -90,79 +86,59 @@ Target "AssemblyInfo" (fun _ ->
// Clean build results
Target "Clean" (fun _ ->
- CleanDirs [buildDir; vsixDir; tempDir; "nuget"]
-)
-
-Target "CleanDocs" (fun _ ->
- CleanDirs ["docs/output"]
+ CleanDirs [buildDir;]
)
// --------------------------------------------------------------------------------------
// Build library & test project
Target "Build" (fun _ ->
// We would like to build only one solution
- !! (solutionFile + ".sln")
- |> MSBuildReleaseExt "" ["VisualStudioVersion", "12.0"] "Rebuild"
+ !! solutionFile
+ |> MSBuildReleaseExt "" ["VisualStudioVersion", "14.0"] "Rebuild"
|> ignore
-)
-
-Target "CleanVSIX" (fun _ ->
- ZipHelper.Unzip vsixDir "bin/EditorConfig.VisualStudio.vsix"
- let regex = Regex("bin")
- let filesToKeep =
- Directory.GetFiles("bin", "*.dll")
- |> Seq.map (fun fileName -> regex.Replace(fileName, vsixDir, 1))
- let filesToDelete =
- Seq.fold (--) (!! "bin/vsix/*.dll") filesToKeep
- ++ "bin/vsix/Microsoft.VisualStudio*"
- ++ "bin/vsix/Microsoft.Build*"
- DeleteFiles filesToDelete
-
- CreateDir buildMergedDir
-
- let filesToPack =
- ["EditorConfig.VisualStudio.dll"; "EditorConfig.Core.dll"; "FSharp.Core.dll"; "Newtonsoft.Json.dll" ; "Chessie.dll";
- "ReactiveUI.dll"; "ReactiveUI.Events.dll"; "Splat.dll"; "System.Reactive.Core.dll"; "System.Reactive.Interfaces.dll"; "System.Reactive.Linq.dll"; "System.Reactive.PlatformServices.dll"; "System.Reactive.Windows.Threading.dll"]
- |> List.map (fun l -> vsixDir @@ l)
-
- let toPack = filesToPack |> separated " "
-
- let result =
- ExecProcess (fun info ->
- info.FileName <- currentDirectory </> "packages" </> "build" </> "ILRepack" </> "tools" </> "ILRepack.exe"
- info.Arguments <- sprintf "/verbose /lib:%s /ver:%s /out:%s %s" vsixDir release.AssemblyVersion (buildMergedDir </> "Paket.VisualStudio.dll") toPack
- ) (TimeSpan.FromMinutes 5.)
- if result <> 0 then failwithf "Error during ILRepack execution."
-
- DeleteFiles filesToPack
- CopyFile vsixDir (buildMergedDir </> "Paket.VisualStudio.dll")
-
- ZipHelper.Zip vsixDir "bin/Paket.VisualStudio.vsix" (!! "bin/vsix/**")
+ File.Copy ("src/EditorConfig.VisualStudio/bin/Release/EditorConfig.vsix", vsixArtifact)
)
-// --------------------------------------------------------------------------------------
-// Generate the documentation
-
-Target "GenerateDocs" (fun _ ->
- executeFSIWithArgs "docs/tools" "generate.fsx" ["--define:RELEASE"] [] |> ignore
-)
+//Target "CleanVSIX" (fun _ ->
+// ZipHelper.Unzip vsixDir "bin/EditorConfig.VisualStudio.vsix"
+// let regex = Regex("bin")
+// let filesToKeep =
+// Directory.GetFiles("bin", "*.dll")
+// |> Seq.map (fun fileName -> regex.Replace(fileName, vsixDir, 1))
+// let filesToDelete =
+// Seq.fold (--) (!! "bin/vsix/*.dll") filesToKeep
+// ++ "bin/vsix/Microsoft.VisualStudio*"
+// ++ "bin/vsix/Microsoft.Build*"
+// DeleteFiles filesToDelete
+//
+// CreateDir buildMergedDir
+//
+// let filesToPack =
+// ["EditorConfig.VisualStudio.dll"; "EditorConfig.Core.dll"; "FSharp.Core.dll"; "Newtonsoft.Json.dll" ; "Chessie.dll";
+// "ReactiveUI.dll"; "ReactiveUI.Events.dll"; "Splat.dll"; "System.Reactive.Core.dll"; "System.Reactive.Interfaces.dll"; "System.Reactive.Linq.dll"; "System.Reactive.PlatformServices.dll"; "System.Reactive.Windows.Threading.dll"]
+// |> List.map (fun l -> vsixDir @@ l)
+//
+// let toPack = filesToPack |> separated " "
+//
+// let result =
+// ExecProcess (fun info ->
+// info.FileName <- currentDirectory </> "packages" </> "build" </> "ILRepack" </> "tools" </> "ILRepack.exe"
+// info.Arguments <- sprintf "/verbose /lib:%s /ver:%s /out:%s %s" vsixDir release.AssemblyVersion (buildMergedDir </> "Paket.VisualStudio.dll") toPack
+// ) (TimeSpan.FromMinutes 5.)
+//
+// if result <> 0 then failwithf "Error during ILRepack execution."
+//
+// DeleteFiles filesToPack
+// CopyFile vsixDir (buildMergedDir </> "Paket.VisualStudio.dll")
+//
+// ZipHelper.Zip vsixDir "bin/Paket.VisualStudio.vsix" (!! "bin/vsix/**")
+//)
// --------------------------------------------------------------------------------------
// Release Scripts
-Target "ReleaseDocs" (fun _ ->
- let tempDocsDir = "temp/gh-pages"
- CleanDir tempDocsDir
- Repository.cloneSingleBranch "" cloneUrl "gh-pages" tempDocsDir
-
- fullclean tempDocsDir
- CopyRecursive "docs/output" tempDocsDir true |> tracefn "%A"
- StageAll tempDocsDir
- Git.Commit.Commit tempDocsDir (sprintf "[skip ci] Update generated documentation for version %s" release.NugetVersion)
- Branches.push tempDocsDir
-)
(*#load "paket-files/build/fsharp/FAKE/modules/Octokit/Octokit.fsx"
open Octokit
@@ -246,9 +222,7 @@ Target "Default" DoNothing
==> "Build"
//==> "CleanVSIX"
==> "Default"
- (*==> "CleanDocs"
- ==> "GenerateDocs"
- ==> "ReleaseDocs"
+ (*
==> "ReleaseToGitHub"
==> "UploadToGallery"*)
==> "Release"
View
@@ -1,5 +1,21 @@
# Release Notes
+## 0.6.0
+
+* No longer relies on C++ editorconfig but on the .NET port
+* Moved to @jedmao branch that relies on codemaid based architecture so we can restore global settings more aggressively
+ This to relieve a common nuisance that having two visual studios one with and one without .editorconfig settings do not respect global
+ (default) settings.
+* Add file template to easily add `.editorconfig` file to a project
+* Re added @jaredpars autocomplete and syntax highlight work
+* Moved to paket and fake for builds and dependency management
+* Moved to VS SDK nuget packages
+* Fixed SO exception when renaming a file (only occured in development version not in previously published release)
+
+## 0.5.0
+
+* Autocomplete now accepts domain properties
+* VS 2015 support
## 0.4.0
@@ -1,36 +1,13 @@
-using System;
+// <auto-generated/>
using System.Reflection;
-using System.Resources;
-using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("EditorConfig")]
-[assembly: AssemblyDescription("Loads editor options such as indentation sizes from standard, cross-platform .editorconfig files.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("EditorConfig Team")]
-[assembly: AssemblyProduct("EditorConfig")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
-[assembly: CLSCompliant(false)]
-[assembly: NeutralResourcesLanguage("en-US")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers
-// by using the '*' as shown below:
-
-[assembly: AssemblyVersion("0.4.0.*")]
-[assembly: AssemblyFileVersion("0.4.0.*")]
-
-
-
-[assembly: GuidAttribute("6b4a6b64-eda9-4078-a549-905ed7d6b8aa")]
+[assembly: AssemblyTitleAttribute("EditorConfig.VisualStudio")]
+[assembly: AssemblyProductAttribute("EditorConfig.VisualStudio")]
+[assembly: AssemblyDescriptionAttribute("Loads editor options such as indentation sizes from standard, cross-platform .editorconfig files on a per project/solution basis.")]
+[assembly: AssemblyVersionAttribute("0.6.0")]
+[assembly: AssemblyFileVersionAttribute("0.6.0")]
+namespace System {
+ internal static class AssemblyVersionInformation {
+ internal const string Version = "0.6.0";
+ }
+}
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<Identity Id="EditorConfig..5cd8e6a2-be43-4fcc-a345-40f6cc1e9c9f" Version="0.6.0" Language="en-US" Publisher="EditorConfig Team" />

0 comments on commit 48224f1

Please sign in to comment.