Merge branch 'beta'

build/package.json

@@ -22,7 +22,7 @@
     "grunt-contrib-less": "~0.8.0",
     "grunt-cson": "0.16.0",
     "grunt-download-electron": "^2.1.1",
-    "grunt-electron-installer": "1.0.5",
+    "grunt-electron-installer": "1.0.6",
     "grunt-lesslint": "0.17.0",
     "grunt-peg": "~1.1.0",
     "grunt-shell": "~0.3.1",

build/tasks/publish-build-task.coffee

@@ -6,7 +6,6 @@ async = require 'async'
 fs = require 'fs-plus'
 GitHub = require 'github-releases'
 request = require 'request'
-{convertVersion} = require 'grunt-electron-installer'
 
 grunt = null
 
@@ -79,9 +78,8 @@ getAssets = ->
         {assetName: 'atom-api.json', sourcePath: 'atom-api.json'}
       ]
     when 'win32'
-      nupkgVersion = convertVersion(version)
       assets = [{assetName: 'atom-windows.zip', sourcePath: appName}]
-      for squirrelAsset in ['AtomSetup.exe', 'RELEASES', "atom-#{nupkgVersion}-full.nupkg", "atom-#{nupkgVersion}-delta.nupkg"]
+      for squirrelAsset in ['AtomSetup.exe', 'RELEASES', "atom-#{version}-full.nupkg", "atom-#{version}-delta.nupkg"]
         cp path.join(buildDir, 'installer', squirrelAsset), path.join(buildDir, squirrelAsset)
         assets.push({assetName: squirrelAsset, sourcePath: assetName})
       assets

src/browser/auto-update-manager.coffee

@@ -17,14 +17,8 @@ class AutoUpdateManager
 
   constructor: (@version, @testMode, @disabled) ->
     @state = IdleState
-    if process.platform is 'win32'
-      # Squirrel for Windows can't handle query params
-      # https://github.com/Squirrel/Squirrel.Windows/issues/132
-      @feedUrl = 'https://atom.io/api/updates'
-    else
-      @iconPath = path.resolve(__dirname, '..', '..', 'resources', 'atom.png')
-      @feedUrl = "https://atom.io/api/updates?version=#{@version}"
-
+    @iconPath = path.resolve(__dirname, '..', '..', 'resources', 'atom.png')
+    @feedUrl = "https://atom.io/api/updates?version=#{@version}"
     process.nextTick => @setupAutoUpdater()
 
   setupAutoUpdater: ->