diff --git a/build/targets/AssemblyVersions.props b/build/targets/AssemblyVersions.props
index 7bcf65a261d..b885bc070eb 100644
--- a/build/targets/AssemblyVersions.props
+++ b/build/targets/AssemblyVersions.props
@@ -23,15 +23,15 @@
4.6
$(FSLanguageVersion)
- $(FSCoreMajorVersion).1
+ $(FSCoreMajorVersion).2
$(FSCoreMajorVersion).0.0
10.4
- $(FSPackageMajorVersion).1
+ $(FSPackageMajorVersion).2
$(FSPackageMajorVersion).0.0
16
- 1
+ 0
$(VSMajorVersion).0
$(VSMajorVersion).$(VSMinorVersion).0.0
diff --git a/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props b/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props
index d1f5f292644..2d07d58ce69 100644
--- a/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props
+++ b/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props
@@ -74,7 +74,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
4.4.0
- 4.6.1
+ 4.6.2
$(DefaultValueTuplePackageVersion)
$(DefaultFSharpCorePackageVersion)
diff --git a/tests/fsharp/single-test.fs b/tests/fsharp/single-test.fs
index 54915dc1ec1..6ac31be4289 100644
--- a/tests/fsharp/single-test.fs
+++ b/tests/fsharp/single-test.fs
@@ -89,7 +89,7 @@ let generateOverrides =
"
template
-let generateProjectArtifacts (pc:ProjectConfiguration) targetFramework =
+let generateProjectArtifacts (pc:ProjectConfiguration) targetFramework configuration =
let computeSourceItems addDirectory addCondition (compileItem:CompileItem) sources =
let computeInclude src =
let fileName = if addDirectory then Path.Combine(pc.SourceDirectory, src) else src
@@ -172,7 +172,7 @@ let generateProjectArtifacts (pc:ProjectConfiguration) targetFramework =
|> replaceTokens "$(OPTIMIZE)" optimize
|> replaceTokens "$(DEBUG)" debug
|> replaceTokens "$(TARGETFRAMEWORK)" targetFramework
- |> replaceTokens "$(RestoreFromArtifactsPath)" (Path.GetFullPath(__SOURCE_DIRECTORY__) + "/../../artifacts")
+ |> replaceTokens "$(RestoreFromArtifactsPath)" (Path.GetFullPath(__SOURCE_DIRECTORY__) + "/../../artifacts/packages/" + configuration)
generateProjBody
@@ -218,7 +218,7 @@ let singleTestBuildAndRunCore cfg copyFiles p =
let executeFsc testCompilerVersion targetFramework =
let propsBody = generateProps testCompilerVersion
emitFile propsFileName propsBody
- let projectBody = generateProjectArtifacts pc targetFramework
+ let projectBody = generateProjectArtifacts pc targetFramework cfg.BUILD_CONFIG
emitFile projectFileName projectBody
use testOkFile = new FileGuard(Path.Combine(directory, "test.ok"))
exec { cfg with Directory = directory } cfg.DotNetExe (sprintf "run -f %s" targetFramework)
@@ -228,7 +228,7 @@ let singleTestBuildAndRunCore cfg copyFiles p =
let executeFsi testCompilerVersion targetFramework =
let propsBody = generateProps testCompilerVersion
emitFile propsFileName propsBody
- let projectBody = generateProjectArtifacts pc targetFramework
+ let projectBody = generateProjectArtifacts pc targetFramework cfg.BUILD_CONFIG
emitFile projectFileName projectBody
use testOkFile = new FileGuard(Path.Combine(directory, "test.ok"))
exec { cfg with Directory = directory } cfg.DotNetExe "build /t:RunFSharpScript"
diff --git a/vsintegration/ProjectTemplates/ConsoleProject/Template/ConsoleApplication.vstemplate b/vsintegration/ProjectTemplates/ConsoleProject/Template/ConsoleApplication.vstemplate
index 9dc8a923a9b..457a0d84b66 100644
--- a/vsintegration/ProjectTemplates/ConsoleProject/Template/ConsoleApplication.vstemplate
+++ b/vsintegration/ProjectTemplates/ConsoleProject/Template/ConsoleApplication.vstemplate
@@ -27,7 +27,7 @@
-
+
diff --git a/vsintegration/ProjectTemplates/LibraryProject/Template/Library.vstemplate b/vsintegration/ProjectTemplates/LibraryProject/Template/Library.vstemplate
index fbd5c5d7352..07c8ab1065e 100644
--- a/vsintegration/ProjectTemplates/LibraryProject/Template/Library.vstemplate
+++ b/vsintegration/ProjectTemplates/LibraryProject/Template/Library.vstemplate
@@ -27,7 +27,7 @@
-
+
diff --git a/vsintegration/ProjectTemplates/TutorialProject/Template/Tutorial.vstemplate b/vsintegration/ProjectTemplates/TutorialProject/Template/Tutorial.vstemplate
index c1fbf7f6420..73b11c8c907 100644
--- a/vsintegration/ProjectTemplates/TutorialProject/Template/Tutorial.vstemplate
+++ b/vsintegration/ProjectTemplates/TutorialProject/Template/Tutorial.vstemplate
@@ -25,7 +25,7 @@
-
+