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

Merge branch 'master' into merges/release/3.0.1xx-to-master

Browse source
This commit is contained in:
Nick Guerrera 2019-02-23 08:21:25 -08:00
commit 18101b4d6c
29 changed files with 207 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/CopyToLatest/targets/BranchInfo.props
View file

@ -1,5 +1,5 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Channel>release/3.0.1xx</Channel>
<Channel>master</Channel>
</PropertyGroup>
</Project>

2
src/CopyToLatest/targets/FinishBuild.targets
View file

@ -2,7 +2,7 @@
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="FinalizeBuild"
DependsOnTargets="SetSdkVersionInfo"
AfterTargets="Build">
BeforeTargets="AfterBuild">
<CopyBlobsToLatest FeedUrl="$(DotnetPublishSdkAssetsBlobFeedUrl)"
AccountKey="$(DotNetPublishSdkAssetsBlobFeedKey)"
NugetVersion="$(FullNugetVersion)"

38
src/SdkResolver/SdkResolver.csproj Normal file
View file

@ -0,0 +1,38 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>$(CoreSdkTargetFramework)</TargetFramework>
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
<GenerateDependencyFile>false</GenerateDependencyFile>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<GenerateRuntimeCofigurationFiles>false</GenerateRuntimeCofigurationFiles>
<AssemblyName>UNUSED</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.MSBuildSdkResolver" Version="$(MicrosoftDotNetMSBuildSdkResolverPackageVersion)" ExcludeAssets="all" GeneratePathProperty="true"/>
<PackageReference Include="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" ExcludeAssets="all" GeneratePathProperty="true" />
<PackageReference Include="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" ExcludeAssets="all" GeneratePathProperty="true" />
</ItemGroup>
<Target
Name="GenerateLayout"
Condition=" '$(OS)' == 'Windows_NT' "
BeforeTargets="AfterBuild"
>
<Message Importance="High" Text="$(MSBuildProjectName) -&gt; $(OutputPath)" />
<RemoveDir Directories="$(OutputPath)" />
<MakeDir Directories="$(OutputPath)" />
<ItemGroup>
<_SdkResolverSrc Include="$(Pkgruntime_win-x86_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x86\native\hostfxr.dll" Arch="x86\" />
<_SdkResolverSrc Include="$(Pkgruntime_win-x64_Microsoft_NETCore_DotNetHostResolver)\runtimes\win-x64\native\hostfxr.dll" Arch="x64\" />
<_SdkResolverSrc Include="$(PkgMicrosoft_DotNet_MSBuildSdkResolver)\lib\net472\**\*.dll" Arch="" />
<_SdkResolverDst Include="@(_SdkResolverSrc->'$(OutputPath)%(Arch)%(RecursiveDir)%(Filename)%(Extension)')" />
</ItemGroup>
<Copy SourceFiles="@(_SdkResolverSrc)" DestinationFiles="@(_SdkResolverDst)" />
</Target>
</Project>

2
src/redist/redist.csproj
View file

@ -11,6 +11,8 @@
of the version from the stage 0 SDK. -->
<PackageReference Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreAppPackageVersion)"
PrivateAssets="All" Publish="true"/>
<ProjectReference Include="..\SdkResolver\SdkResolver.csproj" ReferenceOutputAssembly="false" />
</ItemGroup>
<ItemGroup>

2
src/redist/targets/Badge.targets
View file

@ -6,7 +6,7 @@
<Target Name="GenerateVersionBadge"
DependsOnTargets="SetBadgeProps"
AfterTargets="Build">
BeforeTargets="AfterBuild">
<Message Text="$(VersionBadge)" />
<ReplaceFileContents

8
src/redist/targets/DownloadPackage.csproj
View file

@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Restore">
<Project DefaultTargets="Restore">
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
<PropertyGroup>
<OutputType>Library</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@ -10,4 +10,8 @@
<PackageReference Include="$(PackageToRestore)" Version="$(PackageVersionToRestore)" />
</ItemGroup>
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
<!-- Workaround newer sdk preventing us from downloading Microsoft.AspNetCore.App via PackageReference above. -->
<Target Name="UpdateAspNetToFrameworkReference" />
</Project>

2
src/redist/targets/GenerateArchives.targets
View file

@ -1,7 +1,7 @@
<Project>
<Target Name="GenerateArchives"
DependsOnTargets="GenerateLayout;GetCurrentRuntimeInformation"
AfterTargets="Build">
BeforeTargets="AfterBuild">
<!-- When running in Docker under a Windows host, tar is warning "file changed as we read it" for several files and returning exit code 1.
So this flag allows that to be ignored. -->

7
src/redist/targets/GenerateInstallers.targets
View file

@ -1,8 +1,13 @@
<Project>
<PropertyGroup>
<_BuildUnlessNoBuild Condition="'$(NoBuild)' != 'true'">Build</_BuildUnlessNoBuild>
</PropertyGroup>
<Target Name="GenerateInstallers"
AfterTargets="Pack"
DependsOnTargets="GetCurrentRuntimeInformation;
DependsOnTargets="$(_BuildUnlessNoBuild);
GetCurrentRuntimeInformation;
GenerateMsis;
GeneratePkgs;
GenerateRpms;

4
src/redist/targets/GenerateLayout.targets
View file

@ -358,13 +358,13 @@
CrossgenLayout;
LayoutAppHostTemplate;
SignLayout"
AfterTargets="Build">
BeforeTargets="AfterBuild">
</Target>
<Target Name="GenerateInternalLayout"
DependsOnTargets="GenerateLayout"
AfterTargets="Build">
BeforeTargets="AfterBuild">
<RemoveDir Directories="$(SdkInternalLayoutPath)" />
<MakeDir Directories="$(SdkInternalLayoutPath)" />

20
src/redist/targets/GenerateMSIs.targets
View file

@ -24,6 +24,10 @@
<VSToolsNuspecFile>$(MSBuildThisFileDirectory)/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.$(Architecture).nuspec</VSToolsNuspecFile>
<VSToolsNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Tools.Net.Core.SDK.$(Architecture).$(FullNugetVersion).nupkg</VSToolsNupkgFile>
<SdkResolverLayoutPath>$(ArtifactsDir)bin/SdkResolver/$(Configuration)</SdkResolverLayoutPath>
<VSToolsResolverNuspecFile>$(MSBuildThisFileDirectory)/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.Resolver.nuspec</VSToolsResolverNuspecFile>
<VSToolsResolverNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Tools.Net.Core.SDK.Resolver.nupkg</VSToolsResolverNupkgFile>
<!--<SdkMSBuildExtensionsNuspecFile>$(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec</SdkMSBuildExtensionsNuspecFile>
<SdkMSBuildExtensionsNupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.$(FullNugetVersion).nupkg</SdkMSBuildExtensionsNupkgFile>
<SdkMSBuildExtensionsSwrFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.swr</SdkMSBuildExtensionsSwrFile>-->
@ -181,6 +185,21 @@
'$(VSToolsNupkgFile)'" />
</Target>
<Target Name="GenerateVSToolsResolverNupkg"
DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs;GenerateSdkBundle"
Condition=" '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x86'"
Inputs="$(SdkResolverLayoutPath)/**/*;
$(VSToolsResolverNuspecFile);
$(SdkGenerateNupkgPowershellScript)"
Outputs="$(VSToolsResolverNupkgFile)">
<Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateNupkgPowershellScript) ^
'$(SdkResolverLayoutPath.TrimEnd('\'))' ^
'$(FullNugetVersion)' ^
'$(VSToolsResolverNuspecFile)' ^
'$(VSToolsResolverNupkgFile)'" />
</Target>
<Target Name="GenerateSdkMSBuildExtensionsNupkg"
DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs;GenerateSdkBundle"
Condition=" '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "
@ -213,6 +232,7 @@
SignSdkBundle;
GenerateSdkNupkg;
GenerateVSToolsNupkg;
GenerateVSToolsResolverNupkg;
GenerateSdkMSBuildExtensionsNupkg"
Condition=" '$(OS)' == 'Windows_NT' and !$(Architecture.StartsWith('arm'))" />

4
src/redist/targets/Signing.targets
View file

@ -1,5 +1,7 @@
<Project>
<Import Project="$(NuGetPackageRoot)microsoft.dotnet.signtool\$(MicrosoftDotNetSignToolVersion)\build\Microsoft.DotNet.SignTool.props" />
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.SignTool" Version="$(MicrosoftDotNetSignToolVersion)" PrivateAssets="All" />
</ItemGroup>
<Target Name="SetSignProps"
Condition="'$(SignCoreSdk)' == 'true'">

2
src/redist/targets/Versions.targets
View file

@ -4,7 +4,7 @@
<VersionMinor>0</VersionMinor>
<VersionSDKMinor>1</VersionSDKMinor>
<VersionPatch>00</VersionPatch>
<ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">preview3</ReleaseSuffix>
<ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">preview4</ReleaseSuffix>
</PropertyGroup>
<Target Name="GetCoreSdkGitCommitInfo">

4
src/redist/targets/packaging/windows/clisdk/Init.cmd
View file

@ -1,5 +1,5 @@
@echo off
set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
set DOTNET_MULTILELVEL_LOOKUP=0
set PATH=%~dp0;%PATH%
set DOTNET_MULTILEVEL_LOOKUP=0
set PATH=%~dp0;%PATH%

4
src/redist/targets/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.Resolver.cxspec Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0"?>
<package>
<aggregate id="MsBuild.Corext" version="15.0"/>
</package>

19
src/redist/targets/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.Resolver.nuspec Normal file
View file

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>VS.Tools.Net.Core.SDK.Resolver</id>
<version>1.0.0</version>
<title>VS.Tools.Net.Core.SDK.Resolver</title>
<authors>Microsoft</authors>
<owners>Microsoft</owners>
<licenseUrl>https://www.microsoft.com/net/dotnet_library_license.htm</licenseUrl>
<projectUrl>https://github.com/dotnet/cli</projectUrl>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<description>.Net Core SDK MSBuild resolver for internal VS build consumption</description>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
</metadata>
<files>
<file src="$DOTNET_BUNDLE$\**\*" target="v15.0\Bin\SdkResolvers\Microsoft.DotNet.MSBuildSdkResolver" />
<file src="VS.Tools.Net.Core.SDK.Resolver.cxspec" />
</files>
</package>

36
src/redist/targets/packaging/windows/clisdk/bundle.wxs
View file

@ -42,25 +42,25 @@
<swid:Tag Regid="microsoft.com" InstallPath="[DOTNETHOME]" />
<util:RegistrySearch Id="CheckSDKInstallLocation_x86"
Variable="SDKInstallLocationExists_x86"
<util:RegistrySearch Id="CheckDotnetInstallLocation_x86"
Variable="DotnetInstallLocationExists_x86"
Result="exists"
Root="HKLM"
Key="SOFTWARE\dotnet\Setup\InstalledVersions\x86\sdk"
Key="SOFTWARE\dotnet\Setup\InstalledVersions\x86"
Value="InstallLocation" />
<util:RegistrySearch Id="SDKInstallLocation_x86"
After="CheckSDKInstallLocation_x86"
Condition="SDKInstallLocationExists_x86"
<util:RegistrySearch Id="DotnetInstallLocation_x86"
After="CheckDotnetInstallLocation_x86"
Condition="DotnetInstallLocationExists_x86"
Variable="DOTNETHOME_X86"
Result="value"
Root="HKLM"
Key="SOFTWARE\dotnet\Setup\InstalledVersions\x86\sdk"
Key="SOFTWARE\dotnet\Setup\InstalledVersions\x86"
Value="InstallLocation" />
<util:FileSearch Id="DotnetExeSearch_x86"
After="SDKInstallLocation_x86"
After="DotnetInstallLocation_x86"
Variable="DotnetExeExists_x86"
Condition="NOT SDKInstallLocationExists_x86"
Condition="NOT DotnetInstallLocationExists_x86"
Result="exists"
Path="[ProgramFilesFolder]dotnet\dotnet.exe"/>
<util:DirectorySearch Id="DotnetExeLocation_x86"
@ -69,25 +69,25 @@
Variable="DOTNETHOME_X86"
Path="[ProgramFilesFolder]dotnet"/>
<util:RegistrySearch Id="CheckSDKInstallLocation_x64"
Variable="SDKInstallLocationExists_x64"
<util:RegistrySearch Id="CheckDotnetInstallLocation_x64"
Variable="DotnetInstallLocationExists_x64"
Result="exists"
Root="HKLM"
Key="SOFTWARE\dotnet\Setup\InstalledVersions\x64\sdk"
Key="SOFTWARE\dotnet\Setup\InstalledVersions\x64"
Value="InstallLocation" />
<util:RegistrySearch Id="SDKInstallLocation_x64"
After="CheckSDKInstallLocation_x64"
Condition="SDKInstallLocationExists_x64"
<util:RegistrySearch Id="DotnetInstallLocation_x64"
After="CheckDotnetInstallLocation_x64"
Condition="DotnetInstallLocationExists_x64"
Variable="DOTNETHOME_X64"
Result="value"
Root="HKLM"
Key="SOFTWARE\dotnet\Setup\InstalledVersions\x64\sdk"
Key="SOFTWARE\dotnet\Setup\InstalledVersions\x64"
Value="InstallLocation" />
<util:FileSearch Id="DotnetExeSearch_x64"
After="SDKInstallLocation_x64"
After="DotnetInstallLocation_x64"
Variable="DotnetExeExists_x64"
Condition="NOT SDKInstallLocationExists_x64"
Condition="NOT DotnetInstallLocationExists_x64"
Result="exists"
Path="[ProgramFiles64Folder]dotnet\dotnet.exe"/>
<util:DirectorySearch Id="DotnetExeLocation_x64"

8
src/redist/targets/packaging/windows/clisdk/registrykeys.wxs
View file

@ -15,15 +15,15 @@
<RegistryValue Action="write" Name="WpfWinformsTemplates" Type="integer" Value="1" KeyPath="yes"/>
</RegistryKey>
</Component>
<Component Id="SDKInstallLocation_x64" Directory="TARGETDIR" Win64="no">
<Component Id="DotnetInstallLocation_x64" Directory="TARGETDIR" Win64="no">
<Condition>VersionNT64 AND DOTNETHOME_X64</Condition>
<RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\x64\sdk">
<RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\x64">
<RegistryValue Action="write" Name="InstallLocation" Type="string" Value="[DOTNETHOME_X64]" KeyPath="yes"/>
</RegistryKey>
</Component>
<Component Id="SDKInstallLocation_x86" Directory="TARGETDIR" Win64="no">
<Component Id="DotnetInstallLocation_x86" Directory="TARGETDIR" Win64="no">
<Condition>DOTNETHOME_X86</Condition>
<RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\x86\sdk">
<RegistryKey Root="HKLM" Key="SOFTWARE\dotnet\Setup\InstalledVersions\x86">
<RegistryValue Action="write" Name="InstallLocation" Type="string" Value="[DOTNETHOME_X86]" KeyPath="yes"/>
</RegistryKey>
</Component>