diff --git a/Directory.Build.props b/Directory.Build.props
index 979c6d08e8ff..a881f20982f4 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,6 +2,11 @@
+
+
+ CSharp
+
+
$(MSBuildThisFileDirectory)
Debug
@@ -9,11 +14,15 @@
$([System.IO.Path]::GetFullPath('$(RepositoryRootDirectory)bin\$(Configuration)'))\
$([System.IO.Path]::GetFullPath('$(RepositoryRootDirectory)bin\obj\$(MSBuildProjectName)'))\
+ true
+
1.0.0
+
+ $(BuildVersion)
alpha-00001
$(VersionPrefix)-$(VersionSuffix)
-
- $(RepositoryRootDirectory).dotnet_cli\
+
+ $(RepositoryRootDirectory).dotnet_cli\
$(DotNet_Install_Dir)\dotnet
$(RepositoryRootDirectory)packages\
diff --git a/build.ps1 b/build.ps1
index 6c9fb1e23c90..93838aae2d38 100644
--- a/build.ps1
+++ b/build.ps1
@@ -26,7 +26,12 @@ $DotnetCLIVersion = Get-Content "$RepoRoot\DotnetCLIVersion.txt"
# Use a repo-local install directory (but not the bin directory because that gets cleaned a lot)
if (!$env:DOTNET_INSTALL_DIR)
{
- $env:DOTNET_INSTALL_DIR="$RepoRoot\.dotnet_cli\"
+ # If running on microbuild, use the auto-cleaned staging directory.
+ $env:DOTNET_INSTALL_DIR=$env:BUILD_STAGINGDIRECTORY
+ if (!$env:DOTNET_INSTALL_DIR)
+ {
+ $env:DOTNET_INSTALL_DIR="$RepoRoot\.dotnet_cli\"
+ }
}
if (!(Test-Path $env:DOTNET_INSTALL_DIR))
diff --git a/build/Targets/MicroBuild.Settings.targets b/build/Targets/MicroBuild.Settings.targets
new file mode 100644
index 000000000000..d51e793205a6
--- /dev/null
+++ b/build/Targets/MicroBuild.Settings.targets
@@ -0,0 +1,95 @@
+
+
+
+
+
+ $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..'))
+
+
+
+
+ $(BUILD_ARTIFACTSTAGINGDIRECTORY)\MicroBuild\Plugins\MicroBuild.Plugins.Signing.1.0.227\build\MicroBuild.Signing.dll
+ $(MicroBuildSigningLibraryV2)
+ true
+ MicrosoftShared
+ 002400000480000094000000060200000024000052534131000400000100010055e0217eb635f69281051f9a823e0c7edd90f28063eb6c7a742a19b4f6139778ee0af438f47aed3b6e9f99838aa8dba689c7a71ddb860c96d923830b57bbd5cd6119406ddb9b002cf1c723bf272d6acbb7129e9d6dd5a5309c94e0ff4b2c884d45a55f475cd7dba59198086f61f5a8c8b5e601c0edbf269733f6f578fc8579c2
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+ true
+
+
+
+
+
+
+
+ $(VSLToolsPath)\Strong Name Keys\MSFT.snk
+ 002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293
+ b03f5f7f11d50a3a
+ 67
+
+
+
+
+
+ $(VSLToolsPath)\Strong Name Keys\35MSSharedLib1024.snk
+ 0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9
+ 31BF3856AD364E35
+ 72
+
+
+
+
+
+
+
+
+
+
+ $(VSLToolsPath)\Strong Name Keys\RoslynInternalKey.Private.snk
+ false
+ $(RoslynInternalKey)
+ fc793a00266884fb
+
+
+
+
+
+
+
+
+
+
+ false
+ true
+
+
+
+
+
+ Microsoft
+ $(StrongNameCertificateFriendlyId)
+
+
+
+
\ No newline at end of file
diff --git a/build/Targets/ProducesNoOutput.Imports.targets b/build/Targets/ProducesNoOutput.Imports.targets
new file mode 100644
index 000000000000..edf149f1af63
--- /dev/null
+++ b/build/Targets/ProducesNoOutput.Imports.targets
@@ -0,0 +1,44 @@
+
+
+
+
+
+ VisualBasic
+
+
+
+
+ CSharp
+
+
+
+
+
+
+
+ $(VCTargetsPath)\Microsoft.Cpp.targets
+
+
+
+
+ $(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.$(MSBuildTargetsLanguageName).targets
+
+
+
+
+ $(MSBuildToolsPath)\Microsoft.$(MSBuildTargetsLanguageName).targets
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/core-sdk.sln b/core-sdk.sln
index c5858bafc774..f27e5e607f8a 100644
--- a/core-sdk.sln
+++ b/core-sdk.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.25428.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tasks", "Tasks", "{1FEED16D-E07D-47C1-BB4C-56CD9F42B53B}"
EndProject
@@ -27,6 +27,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Nuget", "Nuget", "{13EE1E3C
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Core.Build.Tasks.UnitTests", "src\Tasks\Microsoft.DotNet.Core.Build.Tasks.UnitTests\Microsoft.DotNet.Core.Build.Tasks.UnitTests.csproj", "{6A698C1D-F604-4295-B6FC-7FC726F9FE5F}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{F4B31103-96D4-4CB9-BFF1-19AC665818DC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Toolset", "src\Dependencies\Toolset\Toolset.csproj", "{3899F789-E072-476D-B9D6-79E641611648}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -41,6 +45,10 @@ Global
{6A698C1D-F604-4295-B6FC-7FC726F9FE5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6A698C1D-F604-4295-B6FC-7FC726F9FE5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6A698C1D-F604-4295-B6FC-7FC726F9FE5F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3899F789-E072-476D-B9D6-79E641611648}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3899F789-E072-476D-B9D6-79E641611648}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3899F789-E072-476D-B9D6-79E641611648}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+ {3899F789-E072-476D-B9D6-79E641611648}.Release|Any CPU.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -49,5 +57,6 @@ Global
{DF7D2697-B3B4-45C2-8297-27245F528A99} = {1FEED16D-E07D-47C1-BB4C-56CD9F42B53B}
{13EE1E3C-D7F4-48D3-87AE-94CBCCF574E9} = {50A89C27-BA35-44B2-AC57-E54551791C64}
{6A698C1D-F604-4295-B6FC-7FC726F9FE5F} = {1FEED16D-E07D-47C1-BB4C-56CD9F42B53B}
+ {3899F789-E072-476D-B9D6-79E641611648} = {F4B31103-96D4-4CB9-BFF1-19AC665818DC}
EndGlobalSection
EndGlobal
diff --git a/src/Dependencies/Toolset/Toolset.csproj b/src/Dependencies/Toolset/Toolset.csproj
new file mode 100644
index 000000000000..5312502de752
--- /dev/null
+++ b/src/Dependencies/Toolset/Toolset.csproj
@@ -0,0 +1,23 @@
+
+
+
+ false
+
+
+
+ {3899F789-E072-476D-B9D6-79E641611648}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ .NETStandard
+ v1.3
+ true
+ bin
+ false
+ false
+ Library
+ true
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Dependencies/Toolset/project.json b/src/Dependencies/Toolset/project.json
new file mode 100644
index 000000000000..b09106c85b26
--- /dev/null
+++ b/src/Dependencies/Toolset/project.json
@@ -0,0 +1,9 @@
+{
+ "supports" : {},
+ "dependencies": {
+ "MicroBuild.Core": "0.2.0"
+ },
+ "frameworks": {
+ "netstandard1.3": {}
+ }
+}
\ No newline at end of file