mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #7489 from dotnet/dev/nicholg/sdk-servicing

Browse source 
Finalize v2.0.1
This commit is contained in:
Nick Guerrera 2017-09-06 17:36:08 -07:00 • committed by GitHub
commit 6734510020
3 changed files with 15 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/DependencyVersions.props
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<CLI_SharedFrameworkVersion>2.0.1-servicing-25630-01</CLI_SharedFrameworkVersion>
<CLI_SharedFrameworkVersion>2.0.1</CLI_SharedFrameworkVersion>
<CLI_MSBuild_Version>15.3.409</CLI_MSBuild_Version>
<CLI_Roslyn_Version>2.3.2-beta1-61921-05</CLI_Roslyn_Version>
<CLI_Roslyn_Satellites_Version>2.3.0-pre-20170727-1</CLI_Roslyn_Satellites_Version>
@ -12,7 +12,7 @@
<!-- We'll usually want to keep these versions in sync, but we may want to diverge in some
cases, so use separate properties but derive one from the other unless we want to
explicitly use different versions. -->
<CLI_NETSDK_Version>2.0.0-preview3-20170804-1</CLI_NETSDK_Version>
<CLI_NETSDK_Version>2.0.1-servicing-20170821-1</CLI_NETSDK_Version>
<CLI_MSBuildExtensions_Version>$(CLI_NETSDK_Version)</CLI_MSBuildExtensions_Version>
<CLI_NuGet_Version>4.3.0-rtm-4382</CLI_NuGet_Version>

9
build/Signing.proj
View file

@ -38,14 +38,23 @@
<!-- Built binaries -->
<FilesToSign Include="$(OutputDirectory)/sdk/**/csc.exe;
$(OutputDirectory)/sdk/**/csc.dll;
$(OutputDirectory)/sdk/**/vbc.exe;
$(OutputDirectory)/sdk/**/vbc.dll;
$(OutputDirectory)/sdk/**/fsc.exe;
$(OutputDirectory)/sdk/**/fsi.exe;
$(OutputDirectory)/sdk/**/FSharp.*.dll;
$(OutputDirectory)/sdk/**/dotnet.dll;
$(OutputDirectory)/sdk/**/dotnet.resources.dll;
$(OutputDirectory)/sdk/**/System.*.dll;
$(OutputDirectory)/sdk/**/Microsoft.*.dll;
$(OutputDirectory)/sdk/**/NuGet*.dll;
$(OutputDirectory)/sdk/**/datacollector.dll;
$(OutputDirectory)/sdk/**/datacollector.exe;
$(OutputDirectory)/sdk/**/MSBuild.dll;
$(OutputDirectory)/sdk/**/MSBuild.resources.dll;
$(OutputDirectory)/sdk/**/testhost.dll;
$(OutputDirectory)/sdk/**/testhost.exe;
$(OutputDirectory)/sdk/**/testhost.x86.exe;
$(OutputDirectory)/sdk/**/vstest.console.dll;
$(OutputDirectory)/sdk/**/vstest.console.resources.dll">
<Authenticode>$(InternalCertificateId)</Authenticode>

34
test/dotnet-new.Tests/GivenThatIWantANewApp.cs
View file

@ -75,14 +75,14 @@ namespace Microsoft.DotNet.New.Tests
}
[Theory]
[InlineData("console", "RuntimeFrameworkVersion", "microsoft.netcore.app")]
[InlineData("classlib", "NetStandardImplicitPackageVersion", "netstandard.library")]
public void NewProjectRestoresCorrectPackageVersion(string type, string propertyName, string packageName)
[InlineData("console", "microsoft.netcore.app")]
[InlineData("classlib", "netstandard.library")]
public void NewProjectRestoresCorrectPackageVersion(string type, string packageName)
{
var rootPath = TestAssets.CreateTestDirectory(identifier: $"_{type}").FullName;
var packagesDirectory = Path.Combine(rootPath, "packages");
var projectName = "Project";
var expectedVersion = GetFrameworkPackageVersion();
var expectedVersion = "2.0.0";
var repoRootNuGetConfig = Path.Combine(RepoDirectoriesProvider.RepoRoot, "NuGet.Config");
new NewCommand()
@ -98,32 +98,6 @@ namespace Microsoft.DotNet.New.Tests
new DirectoryInfo(Path.Combine(packagesDirectory, packageName))
.Should().Exist()
.And.HaveDirectory(expectedVersion);
string GetFrameworkPackageVersion()
{
var dotnetDir = new FileInfo(DotnetUnderTest.FullName).Directory;
var sharedFxDir = dotnetDir
.GetDirectory("shared", "Microsoft.NETCore.App")
.EnumerateDirectories()
.Single(d => d.Name.StartsWith("2.0.1")); // NOTE: implicit package version will be 2.0.0 again when https://github.com/dotnet/cli/pull/7489 can be merged.
if (packageName == "microsoft.netcore.app")
{
return sharedFxDir.Name;
}
var depsFile = Path.Combine(sharedFxDir.FullName, "Microsoft.NETCore.App.deps.json");
using (var stream = File.OpenRead(depsFile))
using (var reader = new DependencyContextJsonReader())
{
var context = reader.Read(stream);
var dependency = context
.RuntimeLibraries
.Single(library => string.Equals(library.Name, packageName, StringComparison.OrdinalIgnoreCase));
return dependency.Version;
}
}
}
}
}