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

Fixing an issue where there was a new line in the path to dotnet.exe in the sharedframework and added incrementality to BuildProjectsForNuGetPackages.

Browse source
This commit is contained in:
Livar Cunha 2016-06-30 16:13:55 -07:00
parent 9135be75f4
commit 2846a9b2e7
2 changed files with 72 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build/Microsoft.DotNet.Cli.Compile.targets
View file

@ -65,9 +65,7 @@
<SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName> <SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
<SharedFrameworkNuGetVersion>1.0.0</SharedFrameworkNuGetVersion> <SharedFrameworkNuGetVersion>1.0.0</SharedFrameworkNuGetVersion>
<SharedFrameworkNameVersionPath> <SharedFrameworkNameVersionPath>$(StageDirectory)/shared/$(SharedFrameworkName)/$(SharedFrameworkNuGetVersion)</SharedFrameworkNameVersionPath>
$(StageDirectory)/shared/$(SharedFrameworkName)/$(SharedFrameworkNuGetVersion)
</SharedFrameworkNameVersionPath>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

75
build/package/Microsoft.DotNet.Cli.Nupkg.targets
View file

@ -11,46 +11,111 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.Cli.Utils" > <MicrosoftDotNetCliUtilsInputs Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.Cli.Utils/**/*.cs;
$(ProjectsSrcDirectory)/Microsoft.DotNet.Cli.Utils/**/project.json;
$(ProjectsSrcDirectory)/Microsoft.DotNet.Cli.Utils/**/project.lock.json"
Exclude="$(ProjectsSrcDirectory)/Microsoft.DotNet.Cli.Utils/**/obj/**/*.cs" />
<MicrosoftDotNetCompilerCommonInputs Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.Compiler.Common/**/*.cs;
$(ProjectsSrcDirectory)/Microsoft.DotNet.Compiler.Common/**/project.json;
$(ProjectsSrcDirectory)/Microsoft.DotNet.Compiler.Common/**/project.lock.json"
Exclude="$(ProjectsSrcDirectory)/Microsoft.DotNet.Compiler.Common/**/obj/**/*.cs" />
<MicrosoftDotNetFilesInputs Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.Files/**/*.cs;
$(ProjectsSrcDirectory)/Microsoft.DotNet.Files/**/project.json;
$(ProjectsSrcDirectory)/Microsoft.DotNet.Files/**/project.lock.json"
Exclude="$(ProjectsSrcDirectory)/Microsoft.DotNet.Files/**/obj/**/*.cs" />
<MicrosoftDotNetInternalAbstractionsInputs Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.InternalAbstractions/**/*.cs;
$(ProjectsSrcDirectory)/Microsoft.DotNet.InternalAbstractions/**/project.json;
$(ProjectsSrcDirectory)/Microsoft.DotNet.InternalAbstractions/**/project.lock.json"
Exclude="$(ProjectsSrcDirectory)/Microsoft.DotNet.InternalAbstractions/**/obj/**/*.cs" />
<MicrosoftDotNetProjectModelInputs Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel/**/*.cs;
$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel/**/project.json;
$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel/**/project.lock.json"
Exclude="$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel/**/obj/**/*.cs" />
<MicrosoftDotNetProjectModelLoaderInputs Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel.Loader/**/*.cs;
$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel.Loader/**/project.json;
$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel.Loader/**/project.lock.json"
Exclude="$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel.Loader/**/obj/**/*.cs" />
<MicrosoftDotNetProjectModelWorkspacesInputs Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel.Workspaces/**/*.cs;
$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel.Workspaces/**/project.json;
$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel.Workspaces/**/project.lock.json"
Exclude="$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel.Workspaces/**/obj/**/*.cs" />
<MicrosoftExtensionsDependencyModelInputs Include="$(ProjectsSrcDirectory)/Microsoft.Extensions.DependencyModel/**/*.cs;
$(ProjectsSrcDirectory)/Microsoft.Extensions.DependencyModel/**/project.json;
$(ProjectsSrcDirectory)/Microsoft.Extensions.DependencyModel/**/project.lock.json"
Exclude="$(ProjectsSrcDirectory)/Microsoft.Extensions.DependencyModel/**/obj/**/*.cs" />
<MicrosoftExtensionsTestingAbstractionsInputs Include="$(ProjectsSrcDirectory)/Microsoft.Extensions.Testing.Abstractions/**/*.cs;
$(ProjectsSrcDirectory)/Microsoft.Extensions.Testing.Abstractions/**/project.json;
$(ProjectsSrcDirectory)/Microsoft.Extensions.Testing.Abstractions/**/project.lock.json"
Exclude="$(ProjectsSrcDirectory)/Microsoft.Extensions.Testing.Abstractions/**/obj/**/*.cs" />
<MicrosoftDotNetCliUtilsOutputs Include="$(PackagingBuildBasePath)/src/Microsoft.DotNet.Cli.Utils/**/netstandard*/Microsoft.DotNet.Cli.Utils.dll" />
<MicrosoftDotNetCompilerCommonOutputs Include="$(PackagingBuildBasePath)/src/Microsoft.DotNet.Compiler.Common/**/netstandard*/Microsoft.DotNet.Compiler.Common.dll" />
<MicrosoftDotNetFilesOutputs Include="$(PackagingBuildBasePath)/src/Microsoft.DotNet.Files/**/netstandard*/Microsoft.DotNet.Files.dll" />
<MicrosoftDotNetInternalAbstractionsOutputs Include="$(PackagingBuildBasePath)/src/Microsoft.DotNet.InternalAbstractions/**/netstandard*/Microsoft.DotNet.InternalAbstractions.dll" />
<MicrosoftDotNetProjectModelOutputs Include="$(PackagingBuildBasePath)/src/Microsoft.DotNet.ProjectModel/**/netstandard*/Microsoft.DotNet.ProjectModel.dll" />
<MicrosoftDotNetProjectModelLoaderOutputs Include="$(PackagingBuildBasePath)/src/Microsoft.DotNet.ProjectModel.Loader/**/netstandard*/Microsoft.DotNet.ProjectModel.Loader.dll" />
<MicrosoftDotNetProjectModelWorkspacesOutputs Include="$(PackagingBuildBasePath)/src/Microsoft.DotNet.ProjectModel.Workspaces/**/netstandard*/Microsoft.DotNet.ProjectModel.Workspaces.dll" />
<MicrosoftExtensionsDependencyModelOutputs Include="$(PackagingBuildBasePath)/src/Microsoft.Extensions.DependencyModel/**/netstandard*/Microsoft.Extensions.DependencyModel.dll" />
<MicrosoftExtensionsTestingAbstractionsOutputs Include="$(PackagingBuildBasePath)/src/Microsoft.Extensions.Testing.Abstractions/**/netstandard*/Microsoft.Extensions.Testing.Abstractions.dll" />
<ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.Cli.Utils">
<Inputs>@(MicrosoftDotNetCliUtilsInputs)</Inputs>
<Outputs>@(MicrosoftDotNetCliUtilsOutputs)</Outputs>
<ProjectName>Microsoft.DotNet.Cli.Utils</ProjectName> <ProjectName>Microsoft.DotNet.Cli.Utils</ProjectName>
<Version>$(SdkNugetVersion)</Version> <Version>$(SdkNugetVersion)</Version>
</ProjectsToPack> </ProjectsToPack>
<ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.Compiler.Common"> <ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.Compiler.Common">
<Inputs>@(MicrosoftDotNetCompilerCommonInputs)</Inputs>
<Outputs>@(MicrosoftDotNetCompilerCommonOutputs)</Outputs>
<ProjectName>Microsoft.DotNet.Compiler.Common</ProjectName> <ProjectName>Microsoft.DotNet.Compiler.Common</ProjectName>
<Version>$(SdkNugetVersion)</Version> <Version>$(SdkNugetVersion)</Version>
</ProjectsToPack> </ProjectsToPack>
<ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.Files"> <ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.Files">
<Inputs>@(MicrosoftDotNetFilesInputs)</Inputs>
<Outputs>@(MicrosoftDotNetFilesOutputs)</Outputs>
<ProjectName>Microsoft.DotNet.Files</ProjectName> <ProjectName>Microsoft.DotNet.Files</ProjectName>
<Version>$(SdkNugetVersion)</Version> <Version>$(SdkNugetVersion)</Version>
</ProjectsToPack> </ProjectsToPack>
<ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.InternalAbstractions"> <ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.InternalAbstractions">
<Inputs>@(MicrosoftDotNetInternalAbstractionsInputs)</Inputs>
<Outputs>@(MicrosoftDotNetInternalAbstractionsOutputs)</Outputs>
<ProjectName>Microsoft.DotNet.InternalAbstractions</ProjectName> <ProjectName>Microsoft.DotNet.InternalAbstractions</ProjectName>
<Version>$(DependencyModelAndInternalAbstractionsNugetVersion)</Version> <Version>$(DependencyModelAndInternalAbstractionsNugetVersion)</Version>
</ProjectsToPack> </ProjectsToPack>
<ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel"> <ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel">
<Inputs>@(MicrosoftDotNetProjectModelInputs)</Inputs>
<Outputs>@(MicrosoftDotNetProjectModelOutputs)</Outputs>
<ProjectName>Microsoft.DotNet.ProjectModel</ProjectName> <ProjectName>Microsoft.DotNet.ProjectModel</ProjectName>
<Version>$(ProjectModelNugetVersion)</Version> <Version>$(ProjectModelNugetVersion)</Version>
</ProjectsToPack> </ProjectsToPack>
<ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel.Loader"> <ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel.Loader">
<Inputs>@(MicrosoftDotNetProjectModelLoaderInputs)</Inputs>
<Outputs>@(MicrosoftDotNetProjectModelLoaderOutputs)</Outputs>
<ProjectName>Microsoft.DotNet.ProjectModel.Loader</ProjectName> <ProjectName>Microsoft.DotNet.ProjectModel.Loader</ProjectName>
<Version>$(SdkNugetVersion)</Version> <Version>$(SdkNugetVersion)</Version>
</ProjectsToPack> </ProjectsToPack>
<ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel.Workspaces"> <ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel.Workspaces">
<Inputs>@(MicrosoftDotNetProjectModelWorkspacesInputs)</Inputs>
<Outputs>@(MicrosoftDotNetProjectModelWorkspacesOutputs)</Outputs>
<ProjectName>Microsoft.DotNet.ProjectModel.Workspaces</ProjectName> <ProjectName>Microsoft.DotNet.ProjectModel.Workspaces</ProjectName>
<Version>$(SdkNugetVersion)</Version> <Version>$(SdkNugetVersion)</Version>
</ProjectsToPack> </ProjectsToPack>
<ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.Extensions.DependencyModel"> <ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.Extensions.DependencyModel">
<Inputs>@(MicrosoftExtensionsDependencyModelInputs)</Inputs>
<Outputs>@(MicrosoftExtensionsDependencyModelOutputs)</Outputs>
<ProjectName>Microsoft.Extensions.DependencyModel</ProjectName> <ProjectName>Microsoft.Extensions.DependencyModel</ProjectName>
<Version>$(DependencyModelAndInternalAbstractionsNugetVersion)</Version> <Version>$(DependencyModelAndInternalAbstractionsNugetVersion)</Version>
</ProjectsToPack> </ProjectsToPack>
<ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.Extensions.Testing.Abstractions"> <ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.Extensions.Testing.Abstractions">
<Inputs>@(MicrosoftExtensionsTestingAbstractionsInputs)</Inputs>
<Outputs>@(MicrosoftExtensionsTestingAbstractionsOutputs)</Outputs>
<ProjectName>Microsoft.Extensions.Testing.Abstractions</ProjectName> <ProjectName>Microsoft.Extensions.Testing.Abstractions</ProjectName>
<Version>$(SdkNugetVersion)</Version> <Version>$(SdkNugetVersion)</Version>
</ProjectsToPack> </ProjectsToPack>
<ProjectPackTargetInputs Include="$(PackagingBuildBasePath)/src/%(ProjectsToPack.ProjectName)/**/netstandard*/%(ProjectName).dll" /> <ProjectPackTargetInputs Include="%(ProjectsToPack.Outputs)" />
<ProjectPackTargetOutputs Include="$(NupkgOutputDirectory)/%(ProjectsToPack.ProjectName).%(ProjectsToPack.Version).nupkg" /> <ProjectPackTargetOutputs Include="$(NupkgOutputDirectory)/%(ProjectsToPack.ProjectName).%(ProjectsToPack.Version).nupkg" />
</ItemGroup> </ItemGroup>
</Target> </Target>
@ -70,7 +135,9 @@
<Target Name="BuildProjectsForNuGetPackages" <Target Name="BuildProjectsForNuGetPackages"
DependsOnTargets="Init; DependsOnTargets="Init;
SetupGenerateNugetPackagesInputsOutputs" SetupGenerateNugetPackagesInputsOutputs"
Condition=" '$(OS)' == 'Windows_NT' "> Condition=" '$(OS)' == 'Windows_NT' "
Inputs="%(ProjectsToPack.Inputs)"
Outputs="%(ProjectsToPack.Outputs)">
<MakeDir Directories="$(PackagingBuildBasePath)" /> <MakeDir Directories="$(PackagingBuildBasePath)" />
<Exec Command="$(DotnetStage2) build <Exec Command="$(DotnetStage2) build