diff --git a/build/BundledTemplates.props b/build/BundledTemplates.props index 108e19f92..0e1da89fc 100644 --- a/build/BundledTemplates.props +++ b/build/BundledTemplates.props @@ -1,7 +1,7 @@ - + diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 8eee157e8..b6d4bdc10 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -29,7 +29,7 @@ 2.1.400-preview1-20180705-1834985 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) - 1.0.2-beta3 + 1.0.2-beta4-20180803-1918431 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.2-beta3-20180716-1864993 1.0.2-beta3 diff --git a/test/EndToEnd/GivenDotNetUsesMSBuild.cs b/test/EndToEnd/GivenDotNetUsesMSBuild.cs index 7e15e25b8..eade05c5c 100644 --- a/test/EndToEnd/GivenDotNetUsesMSBuild.cs +++ b/test/EndToEnd/GivenDotNetUsesMSBuild.cs @@ -19,7 +19,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd { string projectDirectory = directory.Path; - string newArgs = "console -f netcoreapp2.1 --debug:ephemeral-hive --no-restore"; + string newArgs = "console -f netcoreapp2.2 --debug:ephemeral-hive --no-restore"; new NewCommandShim() .WithWorkingDirectory(projectDirectory) .Execute(newArgs) diff --git a/test/EndToEnd/SupportedNetCoreAppVersions.cs b/test/EndToEnd/SupportedNetCoreAppVersions.cs index fe1eb44e2..97e8262b9 100644 --- a/test/EndToEnd/SupportedNetCoreAppVersions.cs +++ b/test/EndToEnd/SupportedNetCoreAppVersions.cs @@ -18,7 +18,8 @@ namespace EndToEnd "1.0", "1.1", "2.0", - "2.1" + "2.1", + "2.2" }.Select(version => new object[] { version }); } } diff --git a/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs b/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs index 15f8527c8..d06967edd 100644 --- a/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs +++ b/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs @@ -93,7 +93,7 @@ namespace Microsoft.DotNet.Cli.Build.Tests string dir = "pkgs"; string args = $"--packages {dir}"; - string newArgs = $"console -f netcoreapp2.1 -o \"{rootPath}\" --debug:ephemeral-hive --no-restore"; + string newArgs = $"console -f netcoreapp2.2 -o \"{rootPath}\" --debug:ephemeral-hive --no-restore"; new NewCommandShim() .WithWorkingDirectory(rootPath) .Execute(newArgs) @@ -115,7 +115,7 @@ namespace Microsoft.DotNet.Cli.Build.Tests var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug"; var outputDll = Directory.EnumerateFiles( - Path.Combine(rootPath, "bin", configuration, "netcoreapp2.1"), "*.dll", + Path.Combine(rootPath, "bin", configuration, "netcoreapp2.2"), "*.dll", SearchOption.TopDirectoryOnly) .Single(); diff --git a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs index a438cd063..505eddfcb 100644 --- a/test/dotnet-new.Tests/GivenThatIWantANewApp.cs +++ b/test/dotnet-new.Tests/GivenThatIWantANewApp.cs @@ -76,7 +76,7 @@ namespace Microsoft.DotNet.New.Tests // Remove the expectedVersion parameter once we have templates targetting netcoreapp2.2. [Theory] - [InlineData("console", "microsoft.netcore.app", "2.1.0")] + [InlineData("console", "microsoft.netcore.app", null)] [InlineData("classlib", "netstandard.library", "2.0.3")] // FIXME: This is pinned to 2.0.3 due to https://github.com/dotnet/sdk/issues/2410 public void NewProjectRestoresCorrectPackageVersion(string type, string packageName, string expectedVersion) { diff --git a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs index ba51449fe..cf4a29a33 100644 --- a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs +++ b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs @@ -208,7 +208,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug"; var outputProgram = rootDir - .GetDirectory("bin", configuration, "netcoreapp2.1", "publish", $"{rootDir.Name}.dll") + .GetDirectory("bin", configuration, "netcoreapp2.2", "publish", $"{rootDir.Name}.dll") .FullName; new TestCommand(outputProgram) @@ -270,7 +270,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug"; var outputProgram = rootDir - .GetDirectory("bin", configuration, "netcoreapp2.1", rid, "publish", $"{rootDir.Name}.dll") + .GetDirectory("bin", configuration, "netcoreapp2.2", rid, "publish", $"{rootDir.Name}.dll") .FullName; new TestCommand(outputProgram)