diff --git a/README.md b/README.md index 1ac6a3e07..e50f6f517 100644 --- a/README.md +++ b/README.md @@ -203,3 +203,4 @@ License ------- By downloading the .zip you are agreeing to the terms in the project [EULA](https://aka.ms/dotnet-core-eula). + diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 644f257c7..a339621bd 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -9,7 +9,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 4.2.0-rtm-171122-0 + 10.1.2-rtm-180131-0 2.7.0-beta3-62529-06 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) @@ -43,21 +43,19 @@ $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) - 15.6.0-preview-20171211-02 + 15.6.0-preview-20180109-01 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) 0.2.0-beta-000042 0.2.0 - pre-20171122-1 - 2.6.0-$(CLI_Deps_Satellites_Build) - 4.4.1-$(CLI_Deps_Satellites_Build) + 2.6.0-pre-20171122-1 - 2.0.1-servicing-25908-02 + 2.0.1-servicing-26011-01 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) diff --git a/build/Signing.proj b/build/Signing.proj index da686886a..11871f15a 100644 --- a/build/Signing.proj +++ b/build/Signing.proj @@ -40,6 +40,7 @@ - diff --git a/build/package/Installer.MSI.targets b/build/package/Installer.MSI.targets index 88eff96ba..cd550e5a4 100644 --- a/build/package/Installer.MSI.targets +++ b/build/package/Installer.MSI.targets @@ -2,7 +2,7 @@ - 3.10.2 + 3.10.4 https://dotnetcli.azureedge.net/build/wix/wix.$(WixVersion).zip $(IntermediateDirectory)/WixTools/$(WixVersion) $(WixRoot)/WixTools.$(WixVersion).zip diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj b/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj index fefc8affe..9457ebacf 100644 --- a/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj +++ b/build_projects/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.csproj @@ -12,7 +12,7 @@ - + diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj index 4a9a444c4..bd7badca8 100644 --- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj +++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj @@ -19,11 +19,12 @@ - + + diff --git a/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj b/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj index ed7002589..fb5f6f8dd 100644 --- a/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj +++ b/build_projects/shared-build-targets-utils/shared-build-targets-utils.csproj @@ -15,12 +15,12 @@ - + - + diff --git a/src/tool_fsharp/tool_fsc.csproj b/src/tool_fsharp/tool_fsc.csproj index eea1978d5..ffc343e47 100644 --- a/src/tool_fsharp/tool_fsc.csproj +++ b/src/tool_fsharp/tool_fsc.csproj @@ -12,7 +12,6 @@ -