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/BundledRuntimes.props b/build/BundledRuntimes.props index 50dc51106..0ab61c2ce 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -59,7 +59,7 @@ Condition="!Exists('$(AspNetCoreSharedFxArchiveFile)')"> $(CoreSetupRootUrl)$(AspNetCoreVersion)/$(AspNetCoreSharedFxArchiveFileName)$(CoreSetupBlobAccessTokenParam) $(AspNetCoreSharedFxArchiveFile) - $(SharedFrameworkPublishDirectory) + $(AspNetCoreSharedFxPublishDirectory) <_DownloadAndExtractItem Include="CombinedSharedHostAndFrameworkArchive" diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 6a0f6386a..bf91e218b 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.1.0-preview1-28124 + 2.1.0-preview1-28228 2.1.0-preview2-26131-06 $(MicrosoftNETCoreAppPackageVersion) 15.6.0-preview-000054-1286830 @@ -9,7 +9,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 4.2.0-rtm-171122-0 + 10.1.2-rtm-180131-0 2.8.0-beta1-62608-01 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) @@ -44,21 +44,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) @@ -67,9 +65,9 @@ - 2.1.0-prerelease-02430-04 - 2.0.0-preview2-25331-01 2.1.0-prerelease-02430-04 + $(BuildTasksFeedToolVersion) + 2.0.0-preview2-25331-01 diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index 8e1c1e069..f8b41839b 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -4,7 +4,7 @@ - + - + @@ -29,7 +29,7 @@ - + ]]> @@ -39,13 +39,13 @@ ]]> - + - + $(BaseOutputDirectory)/intermediate $(BaseOutputDirectory)/packages $(IntermediateDirectory)/sharedFrameworkPublish - - $(BaseOutputDirectory)/AspRT + $(IntermediateDirectory)/aspnetSharedFxPublish $(IntermediateDirectory)/backwardsCompatibleSharedFrameworksPublish $(BaseOutputDirectory)/test/ $(OutputDirectory)/dotnet$(ExeExtension) $(IntermediateDirectory)/GeneratedMSBuildExtensions $(IntermediateDirectory)/MSBuildExtensionsLayout $(MSBuildExtensionsLayoutDirectory)/MSBuildSdkResolver - + $(BaseOutputDirectory)/PreviousStage.props 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/package/Layout.targets b/build/package/Layout.targets index 4c14f6ee3..0ba2c3cfd 100644 --- a/build/package/Layout.targets +++ b/build/package/Layout.targets @@ -16,7 +16,7 @@ - + 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/packaging/windows/clisdk/bundle.thm b/packaging/windows/clisdk/bundle.thm index a9c3d64d3..797d2cab1 100644 --- a/packaging/windows/clisdk/bundle.thm +++ b/packaging/windows/clisdk/bundle.thm @@ -24,14 +24,15 @@ #(loc.WelcomeHeaderMessage) - #(loc.WelcomeDescription) - #(loc.LearnMoreTitle) - #(loc.CoreDocumentationLink) - #(loc.SDKDocumentation) - #(loc.PrivacyStatementLink) - #(loc.MITLicenseLink) - #(loc.InstallationNoteTitle) - #(loc.InstallationNote) + #(loc.WelcomeDescription) + #(loc.LearnMoreTitle) + #(loc.CoreDocumentationLink) + #(loc.SDKDocumentation) + #(loc.PrivacyStatementLink) + #(loc.MITLicenseLink) + #(loc.InstallationNoteTitle) + #(loc.InstallationNote) + #(loc.VisualStudioWarning) diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl index 09d08194b..92deb5132 100644 --- a/packaging/windows/clisdk/bundle.wxl +++ b/packaging/windows/clisdk/bundle.wxl @@ -74,4 +74,6 @@ Resources Installation note A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete. + If you plan to use .NET Core 2.1 with Visual Studio, Visual Studio 2017 15.7 or newer is recommended. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Learn More</A>. + diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 9b5208eee..7f1f5e01c 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -37,15 +37,15 @@ - - - + + - + - + @@ -104,7 +104,7 @@ - + @@ -141,7 +141,7 @@ $(PublishDir)/%(MSBuildExtensionsContent.DeploymentSubpath)%(RecursiveDir)%(Filename)%(Extension) - + @@ -262,11 +262,11 @@ - + - + @@ -291,7 +291,7 @@ CreateSymbols="$(CreateCrossgenSymbols)" DiasymReaderPath="@(DiasymReaderPath)" PlatformAssemblyPaths="@(PlatformAssemblies);@(RoslynFolders);$(SharedFrameworkNameVersionPath)" /> - + - + @@ -330,7 +330,7 @@ - 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 @@ - diff --git a/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config b/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config deleted file mode 100644 index f2758d9d5..000000000 --- a/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj b/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj index 076146534..e2bce1d11 100644 --- a/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj +++ b/test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj @@ -7,12 +7,6 @@ $(AssetTargetFallback);netstandardapp1.5;dotnet5.4;portable-net451+win8 - - - PreserveNewest - - - diff --git a/test/dotnet-new.Tests/AspNetNuGetConfiguration.cs b/test/dotnet-new.Tests/AspNetNuGetConfiguration.cs deleted file mode 100644 index b49c81009..000000000 --- a/test/dotnet-new.Tests/AspNetNuGetConfiguration.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.IO; - -namespace Microsoft.DotNet.New.Tests -{ - public class AspNetNuGetConfiguration - { - public static void WriteNuGetConfigWithAspNetPrivateFeeds(string path) - { - string resourceName = "dotnet-new.Tests.NuGet.tempaspnetpatch.config"; - using (Stream input = typeof(GivenThatIWantANewAppWithSpecifiedType).Assembly.GetManifestResourceStream(resourceName)) - using (Stream output = File.OpenWrite(path)) - { - input.CopyTo(output); - } - } - } -} \ No newline at end of file diff --git a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs index 0ffdf83e8..b195d55bb 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs @@ -44,11 +44,7 @@ namespace Microsoft.DotNet.New.Tests var rootPath = TestAssets.CreateTestDirectory().FullName; var packagesDirectory = Path.Combine(rootPath, "packages"); - // For testing the 2.1 templates - some of their packages are currently only in private feeds. - var configFile = Path.Combine(rootPath, "NuGet.Config"); - AspNetNuGetConfiguration.WriteNuGetConfigWithAspNetPrivateFeeds(configFile); - // For "normal" builds, once the packages needed for 2.1 templates are in the public feeds - //var configFile = Path.Combine(RepoDirectoriesProvider.RepoRoot, "NuGet.Config"); + var configFile = Path.Combine(RepoDirectoriesProvider.RepoRoot, "NuGet.Config"); foreach (string cSharpTemplate in cSharpTemplates) { diff --git a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs index 6be4d1b0e..5a080e772 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs @@ -16,30 +16,29 @@ namespace Microsoft.DotNet.New.Tests public class GivenThatIWantANewAppWithSpecifiedType : TestBase { [Theory] - [InlineData("C#", "console", false, false)] - [InlineData("C#", "classlib", false, false)] - [InlineData("C#", "mstest", false, false)] - [InlineData("C#", "xunit", false, false)] - [InlineData("C#", "web", true, false)] - [InlineData("C#", "mvc", true, false)] - [InlineData("C#", "webapi", true, false)] - [InlineData("C#", "angular", false, true)] - [InlineData("C#", "react", false, true)] - [InlineData("C#", "reactredux", false, true)] - [InlineData("F#", "console", false, false)] + [InlineData("C#", "console", false)] + [InlineData("C#", "classlib", false)] + [InlineData("C#", "mstest", false)] + [InlineData("C#", "xunit", false)] + [InlineData("C#", "web", false)] + [InlineData("C#", "mvc", false)] + [InlineData("C#", "webapi", false)] + [InlineData("C#", "angular", true)] + [InlineData("C#", "react", true)] + [InlineData("C#", "reactredux", true)] + [InlineData("F#", "console", false)] // re-enable when this bug is resolved: https://github.com/dotnet/cli/issues/7574 - //[InlineData("F#", "classlib", false, false)] - [InlineData("F#", "mstest", false, false)] - [InlineData("F#", "xunit", false, false)] - [InlineData("F#", "mvc", true, false)] - [InlineData("VB", "console", false, false)] - [InlineData("VB", "classlib", false, false)] - [InlineData("VB", "mstest", false, false)] - [InlineData("VB", "xunit", false, false)] + //[InlineData("F#", "classlib", false)] + [InlineData("F#", "mstest", false)] + [InlineData("F#", "xunit", false)] + [InlineData("F#", "mvc", false)] + [InlineData("VB", "console", false)] + [InlineData("VB", "classlib", false)] + [InlineData("VB", "mstest", false)] + [InlineData("VB", "xunit", false)] public void TemplateRestoresAndBuildsWithoutWarnings( string language, string projectType, - bool useNuGetConfigForAspNet, bool skipSpaWebpackSteps) { string rootPath = TestAssets.CreateTestDirectory(identifier: $"{language}_{projectType}").FullName; @@ -49,11 +48,6 @@ namespace Microsoft.DotNet.New.Tests .Execute($"new {projectType} -lang {language} -o {rootPath} --debug:ephemeral-hive {noRestoreDirective}") .Should().Pass(); - if (useNuGetConfigForAspNet) - { - AspNetNuGetConfiguration.WriteNuGetConfigWithAspNetPrivateFeeds(Path.Combine(rootPath, "NuGet.Config")); - } - if (skipSpaWebpackSteps) { // Not all CI machines have Node installed, so the build would fail if we tried diff --git a/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config b/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config deleted file mode 100644 index 5383ef159..000000000 --- a/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/test/dotnet-new.Tests/dotnet-new.Tests.csproj b/test/dotnet-new.Tests/dotnet-new.Tests.csproj index f022c49be..1d1a34da0 100644 --- a/test/dotnet-new.Tests/dotnet-new.Tests.csproj +++ b/test/dotnet-new.Tests/dotnet-new.Tests.csproj @@ -7,11 +7,6 @@ $(AssetTargetFallback);dnxcore50;portable-net45+win8 - - - - -