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

Fixing the build.

Browse source
This commit is contained in:
Livar Cunha 2017-04-08 00:29:20 -07:00
parent e286c65d25
commit c8b042fd1b
5 changed files with 31 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build/BackwardsCompatibilityRuntimes.props
View file

@ -28,7 +28,7 @@
Condition="!Exists('$(BackwardsCompatibility110CombinedSharedHostAndFrameworkArchive)')"> Condition="!Exists('$(BackwardsCompatibility110CombinedSharedHostAndFrameworkArchive)')">
<Url>$(BackwardsCompatibility110SharedFrameworkArchiveBlobRootUrl)/$(BackwardsCompatibility110CombinedFrameworkHostCompressedFileName)</Url> <Url>$(BackwardsCompatibility110SharedFrameworkArchiveBlobRootUrl)/$(BackwardsCompatibility110CombinedFrameworkHostCompressedFileName)</Url>
<DownloadFileName>$(BackwardsCompatibility110CombinedSharedHostAndFrameworkArchive)</DownloadFileName> <DownloadFileName>$(BackwardsCompatibility110CombinedSharedHostAndFrameworkArchive)</DownloadFileName>
<ExtractDestination>$(BackwardsCompatibilitySharedFrameworksPublishDirectory)</ExtractDestination> <ExtractDestination>$(BackwardsCompatibleSharedFrameworksPublishDirectory)</ExtractDestination>
<!-- don't overwrite the destination because there can be multiple shared fx's and they need to be combined --> <!-- don't overwrite the destination because there can be multiple shared fx's and they need to be combined -->
<OverwriteDestination>False</OverwriteDestination> <OverwriteDestination>False</OverwriteDestination>
</_DownloadAndExtractItem> </_DownloadAndExtractItem>

4
build/OutputDirectories.props
View file

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<BaseOutputDirectory>$(RepoRoot)/artifacts/$(Rid)</BaseOutputDirectory> <BaseOutputDirectory>$(RepoRoot)/artifacts/$(Rid)</BaseOutputDirectory>
<OutputDirectory>$(BaseOutputDirectory)/stage2</OutputDirectory> <OutputDirectory>$(BaseOutputDirectory)/stage2</OutputDirectory>
<Stage2WithBackwardsCompatibilityRuntimesOutputDirectory>$(BaseOutputDirectory)/stage2WithBackwardsCompatibilityRuntimes</Stage2WithBackwardsCompatibilityRuntimesOutputDirectory> <Stage2WithBackwardsCompatibleRuntimesOutputDirectory>$(BaseOutputDirectory)/stage2WithBackwardsCompatibleRuntimes</Stage2WithBackwardsCompatibleRuntimesOutputDirectory>
<SdkOutputDirectory>$(OutputDirectory)/sdk/$(SdkVersion)</SdkOutputDirectory> <SdkOutputDirectory>$(OutputDirectory)/sdk/$(SdkVersion)</SdkOutputDirectory>
<SymbolsDirectory>$(BaseOutputDirectory)/stage2symbols</SymbolsDirectory> <SymbolsDirectory>$(BaseOutputDirectory)/stage2symbols</SymbolsDirectory>
<RoslynDirectory>$(SdkOutputDirectory)/Roslyn</RoslynDirectory> <RoslynDirectory>$(SdkOutputDirectory)/Roslyn</RoslynDirectory>
@ -10,7 +10,7 @@
<IntermediateDirectory>$(BaseOutputDirectory)/intermediate</IntermediateDirectory> <IntermediateDirectory>$(BaseOutputDirectory)/intermediate</IntermediateDirectory>
<PackagesDirectory>$(BaseOutputDirectory)/packages</PackagesDirectory> <PackagesDirectory>$(BaseOutputDirectory)/packages</PackagesDirectory>
<SharedFrameworkPublishDirectory>$(IntermediateDirectory)/sharedFrameworkPublish</SharedFrameworkPublishDirectory> <SharedFrameworkPublishDirectory>$(IntermediateDirectory)/sharedFrameworkPublish</SharedFrameworkPublishDirectory>
<BackwardsCompatibilitySharedFrameworksPublishDirectory>$(IntermediateDirectory)/backwardsCompatibilitySharedFrameworksPublish</BackwardsCompatibilitySharedFrameworksPublishDirectory> <BackwardsCompatibleSharedFrameworksPublishDirectory>$(IntermediateDirectory)/backwardsCompatibleSharedFrameworksPublish</BackwardsCompatibleSharedFrameworksPublishDirectory>
<TestOutputDir>$(RepoRoot)/artifacts/testpackages/</TestOutputDir> <TestOutputDir>$(RepoRoot)/artifacts/testpackages/</TestOutputDir>
<DotnetInOutputDirectory>$(OutputDirectory)/dotnet$(ExeExtension)</DotnetInOutputDirectory> <DotnetInOutputDirectory>$(OutputDirectory)/dotnet$(ExeExtension)</DotnetInOutputDirectory>
<GeneratedMSBuildExtensionsDirectory>$(IntermediateDirectory)/GeneratedMSBuildExtensions</GeneratedMSBuildExtensionsDirectory> <GeneratedMSBuildExtensionsDirectory>$(IntermediateDirectory)/GeneratedMSBuildExtensions</GeneratedMSBuildExtensionsDirectory>

12
src/redist/redist.csproj
View file

@ -224,20 +224,20 @@
<Delete Files="@(PdbsToClean)" /> <Delete Files="@(PdbsToClean)" />
</Target> </Target>
<Target Name="PublishStage2WithLegacyRuntime" <Target Name="PublishStage2WithBackwardsCompatibleRuntimes"
AfterTargets="PublishLzmaArchive;"> AfterTargets="PublishLzmaArchive;">
<ItemGroup> <ItemGroup>
<LegacySharedFramework Remove="*" /> <BackwardsCompatibleSharedFrameworks Remove="*" />
<LegacySharedFramework Include="$(LegacySharedFrameworkPublishDirectory)/**/*" /> <BackwardsCompatibleSharedFrameworks Include="$(BackwardsCompatibleSharedFrameworksPublishDirectory)/**/*" />
<Stage2Cli Remove="*" /> <Stage2Cli Remove="*" />
<Stage2Cli Include="$(OutputDirectory)/**/*" /> <Stage2Cli Include="$(OutputDirectory)/**/*" />
</ItemGroup> </ItemGroup>
<Copy SourceFiles="@(LegacySharedFramework)" <Copy SourceFiles="@(BackwardsCompatibleSharedFrameworks)"
DestinationFiles="@(LegacySharedFramework->'$(Stage2WithLegacyRuntimeOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" /> DestinationFiles="@(BackwardsCompatibleSharedFrameworks->'$(Stage2WithBackwardsCompatibleRuntimesOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
<Copy SourceFiles="@(Stage2Cli)" <Copy SourceFiles="@(Stage2Cli)"
DestinationFiles="@(Stage2Cli->'$(Stage2WithLegacyRuntimeOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" /> DestinationFiles="@(Stage2Cli->'$(Stage2WithBackwardsCompatibleRuntimesOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
</Target> </Target>
</Project> </Project>

2
test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs
View file

@ -100,7 +100,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
_pjDotnet = pjDotnet ?? GetPjDotnetPath(); _pjDotnet = pjDotnet ?? GetPjDotnetPath();
_stage2Sdk = Directory.EnumerateDirectories(Path.Combine(_artifacts, "stage2", "sdk")).First(); _stage2Sdk = Directory.EnumerateDirectories(Path.Combine(_artifacts, "stage2", "sdk")).First();
_stage2WithBackwardsCompatibleRuntimesDirectory = _stage2WithBackwardsCompatibleRuntimesDirectory =
Path.Combine(_artifacts, "stage2WithBackwardsCompatibilityRuntimes"); Path.Combine(_artifacts, "stage2WithBackwardsCompatibleRuntimes");
_testPackages = Path.Combine(RepoRoot, "artifacts", "testpackages", "packages"); _testPackages = Path.Combine(RepoRoot, "artifacts", "testpackages", "packages");
} }

24
test/dotnet-migrate.Tests/GivenThatIWantToMigrateDeprecatedProjects.cs
View file

@ -406,7 +406,7 @@ namespace Microsoft.DotNet.Migration.Tests
"The 'resourceFiles' option is deprecated. Use 'embed' in 'buildOptions' instead."); "The 'resourceFiles' option is deprecated. Use 'embed' in 'buildOptions' instead.");
} }
[RequiresSpecificFrameworkFact("netcoreapp1.0")] [Fact]
public void MigratingDeprecatedResource() public void MigratingDeprecatedResource()
{ {
var projectDirectory = TestAssets var projectDirectory = TestAssets
@ -431,6 +431,12 @@ namespace Microsoft.DotNet.Migration.Tests
.Execute("build -c Debug") .Execute("build -c Debug")
.Should().Pass(); .Should().Pass();
if (!EnvironmentInfo.HasSharedFramework("netcoreapp1.1"))
{
// running the app requires netcoreapp1.1
return;
}
var cmd = new DotnetCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes) var cmd = new DotnetCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes)
.WithWorkingDirectory(projectDirectory) .WithWorkingDirectory(projectDirectory)
.ExecuteWithCapturedOutput("run -c Debug"); .ExecuteWithCapturedOutput("run -c Debug");
@ -458,7 +464,7 @@ namespace Microsoft.DotNet.Migration.Tests
"The 'resourceBuiltIn' option is deprecated. Use 'embed' in 'buildOptions' instead."); "The 'resourceBuiltIn' option is deprecated. Use 'embed' in 'buildOptions' instead.");
} }
[RequiresSpecificFrameworkFact("netcoreapp1.0")] [Fact]
public void MigratingDeprecatedResourceBuiltIn() public void MigratingDeprecatedResourceBuiltIn()
{ {
var projectDirectory = TestAssets var projectDirectory = TestAssets
@ -483,6 +489,12 @@ namespace Microsoft.DotNet.Migration.Tests
.Execute("build -c Debug") .Execute("build -c Debug")
.Should().Pass(); .Should().Pass();
if (!EnvironmentInfo.HasSharedFramework("netcoreapp1.1"))
{
// running the app requires netcoreapp1.1
return;
}
var cmd = new DotnetCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes) var cmd = new DotnetCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes)
.WithWorkingDirectory(projectDirectory) .WithWorkingDirectory(projectDirectory)
.ExecuteWithCapturedOutput("run -c Debug"); .ExecuteWithCapturedOutput("run -c Debug");
@ -510,7 +522,7 @@ namespace Microsoft.DotNet.Migration.Tests
"The 'resourceExclude' option is deprecated. Use 'embed' in 'buildOptions' instead."); "The 'resourceExclude' option is deprecated. Use 'embed' in 'buildOptions' instead.");
} }
[RequiresSpecificFrameworkFact("netcoreapp1.0")] [Fact]
public void MigratingDeprecatedResourceExclude() public void MigratingDeprecatedResourceExclude()
{ {
var projectDirectory = TestAssets var projectDirectory = TestAssets
@ -534,6 +546,12 @@ namespace Microsoft.DotNet.Migration.Tests
.Execute("build -c Debug") .Execute("build -c Debug")
.Should().Pass(); .Should().Pass();
if (!EnvironmentInfo.HasSharedFramework("netcoreapp1.1"))
{
// running the app requires netcoreapp1.1
return;
}
var cmd = new DotnetCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes) var cmd = new DotnetCommand(DotnetUnderTest.WithBackwardsCompatibleRuntimes)
.WithWorkingDirectory(projectDirectory) .WithWorkingDirectory(projectDirectory)
.ExecuteWithCapturedOutput("run -c Debug"); .ExecuteWithCapturedOutput("run -c Debug");