Switch to new Microsoft.DotNet.SharedFramework.Sdk #909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

RussKie merged 22 commits into dotnet:master from jkoritzinsky:new-sfx-sdk

Jan 5, 2021

Directory.Build.props

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -162,20 +162,21 @@
  
        <ExeSuffix Condition="'$(OSGroup)'=='Windows_NT'">.exe</ExeSuffix>

      </PropertyGroup>

      <PropertyGroup Condition="'$(OutputRid)' == '' and '$(HostRuntimeIdentifier)' != ''">

        <OutputRid>$(HostRuntimeIdentifier.Remove($(HostRuntimeIdentifier.LastIndexOf('-'))))-$(TargetArchitecture)</OutputRid>

      <PropertyGroup Condition="'$(RuntimeIdentifier)' == '' and '$(HostRuntimeIdentifier)' != ''">

        <RuntimeIdentifier>$(HostRuntimeIdentifier.Remove($(HostRuntimeIdentifier.LastIndexOf('-'))))-$(TargetArchitecture)</RuntimeIdentifier>

      </PropertyGroup>

      <!-- Portable -->

      <PropertyGroup Condition="'$(PortableBuild)' == 'true'">

        <OutputRid Condition="'$(OSGroup)' == 'Windows_NT'">win-$(TargetArchitecture)</OutputRid>

        <OutputRid Condition="'$(OSGroup)' == 'OSX'">osx-$(TargetArchitecture)</OutputRid>

        <OutputRid Condition="'$(OSGroup)' == 'Linux' or '$(OSGroup)' == 'Unix'">linux-$(TargetArchitecture)</OutputRid>

        <OutputRid Condition="'$(OSGroup)' == 'FreeBSD'">freebsd-$(TargetArchitecture)</OutputRid>

        <RuntimeIdentifier Condition="'$(OSGroup)' == 'Windows_NT'">win-$(TargetArchitecture)</RuntimeIdentifier>

        <RuntimeIdentifier Condition="'$(OSGroup)' == 'OSX'">osx-$(TargetArchitecture)</RuntimeIdentifier>

        <RuntimeIdentifier Condition="'$(OSGroup)' == 'Linux' or '$(OSGroup)' == 'Unix'">linux-$(TargetArchitecture)</RuntimeIdentifier>

        <RuntimeIdentifier Condition="'$(OSGroup)' == 'FreeBSD'">freebsd-$(TargetArchitecture)</RuntimeIdentifier>

      </PropertyGroup>

      <PropertyGroup>

        <TestTargetRid Condition="'$(TestTargetRid)' == ''">$(OutputRid)</TestTargetRid>

        <TestTargetRid Condition="'$(TestTargetRid)' == ''">$(RuntimeIdentifier)</TestTargetRid>

        <InstallerRuntimeIdentifier Condition="'$(InstallerRuntimeIdentifier)' == ''">$(RuntimeIdentifier)</InstallerRuntimeIdentifier>

      </PropertyGroup>

      <!-- Produce assets into the specified blob feed. -->

    @@ -185,7 +186,7 @@
  
      <!-- Set up the default output and intermediate paths -->

      <PropertyGroup>

        <OSPlatformConfig>$(OutputRid).$(ConfigurationGroup)</OSPlatformConfig>

        <OSPlatformConfig>$(RuntimeIdentifier).$(ConfigurationGroup)</OSPlatformConfig>

        <BaseOutputRootPath>$(BinDir)$(OSPlatformConfig)\</BaseOutputRootPath>

        <CrossGenRootPath>$(BaseOutputRootPath)crossgen\</CrossGenRootPath>

    @@ -207,7 +208,7 @@
  
        <DisableCrossgen>false</DisableCrossgen>

        <!-- Disable cross-gen on FreeBSD for now. This can be revisited when we have full support. -->

        <DisableCrossgen Condition="'$(OSGroup)'=='FreeBSD'">true</DisableCrossgen>

        <OutputVersionBadge>$(AssetOutputPath)sharedfx_$(OutputRid)_$(ConfigurationGroup)_version_badge.svg</OutputVersionBadge>

        <OutputVersionBadge>$(AssetOutputPath)sharedfx_$(RuntimeIdentifier)_$(ConfigurationGroup)_version_badge.svg</OutputVersionBadge>

      </PropertyGroup>

      <!-- Set up handling of build warnings -->

    @@ -232,74 +233,74 @@
  
        <TargetsSles>false</TargetsSles>

      </PropertyGroup>

      <Choose>

        <When Condition="$(OutputRid.StartsWith('win'))">

        <When Condition="$(RuntimeIdentifier.StartsWith('win'))">

          <PropertyGroup>

            <TargetsWindows>true</TargetsWindows>

          </PropertyGroup>

        </When>

        <When Condition="$(OutputRid.StartsWith('osx'))">

        <When Condition="$(RuntimeIdentifier.StartsWith('osx'))">

          <PropertyGroup>

            <TargetsOSX>true</TargetsOSX>

            <TargetsUnix>true</TargetsUnix>

          </PropertyGroup>

        </When>

        <When Condition="$(OutputRid.StartsWith('debian'))">

        <When Condition="$(RuntimeIdentifier.StartsWith('debian'))">

          <PropertyGroup>

            <TargetsDebian>true</TargetsDebian>

            <TargetsLinux>true</TargetsLinux>

            <TargetsUnix>true</TargetsUnix>

          </PropertyGroup>

        </When>

        <When Condition="$(OutputRid.StartsWith('ubuntu'))">

        <When Condition="$(RuntimeIdentifier.StartsWith('ubuntu'))">

          <PropertyGroup>

            <TargetsUbuntu>true</TargetsUbuntu>

            <TargetsLinux>true</TargetsLinux>

            <TargetsUnix>true</TargetsUnix>

          </PropertyGroup>

        </When>

        <When Condition="$(OutputRid.StartsWith('linuxmint'))">

        <When Condition="$(RuntimeIdentifier.StartsWith('linuxmint'))">

          <PropertyGroup>

            <TargetsLinuxMint>true</TargetsLinuxMint>

            <TargetsLinux>true</TargetsLinux>

            <TargetsUnix>true</TargetsUnix>

          </PropertyGroup>

        </When>

        <When Condition="$(OutputRid.StartsWith('rhel'))">

        <When Condition="$(RuntimeIdentifier.StartsWith('rhel'))">

          <PropertyGroup>

            <TargetsRhel>true</TargetsRhel>

            <TargetsLinux>true</TargetsLinux>

            <TargetsUnix>true</TargetsUnix>

          </PropertyGroup>

        </When>

        <When Condition="$(OutputRid.StartsWith('centos'))">

        <When Condition="$(RuntimeIdentifier.StartsWith('centos'))">

          <PropertyGroup>

            <TargetsCentos>true</TargetsCentos>

            <TargetsLinux>true</TargetsLinux>

            <TargetsUnix>true</TargetsUnix>

          </PropertyGroup>

        </When>

        <When Condition="$(OutputRid.StartsWith('opensuse'))">

        <When Condition="$(RuntimeIdentifier.StartsWith('opensuse'))">

          <PropertyGroup>

            <TargetsOpensuse>true</TargetsOpensuse>

            <TargetsLinux>true</TargetsLinux>

            <TargetsUnix>true</TargetsUnix>

          </PropertyGroup>

        </When>

        <When Condition="$(OutputRid.StartsWith('fedora'))">

        <When Condition="$(RuntimeIdentifier.StartsWith('fedora'))">

          <PropertyGroup>

            <TargetsFedora>true</TargetsFedora>

            <TargetsLinux>true</TargetsLinux>

            <TargetsUnix>true</TargetsUnix>

          </PropertyGroup>

        </When>

        <When Condition="$(OutputRid.StartsWith('oracle'))">

        <When Condition="$(RuntimeIdentifier.StartsWith('oracle'))">

          <PropertyGroup>

            <TargetsOracle>true</TargetsOracle>

            <TargetsLinux>true</TargetsLinux>

            <TargetsUnix>true</TargetsUnix>

          </PropertyGroup>

        </When>

        <When Condition="$(OutputRid.StartsWith('sles'))">

        <When Condition="$(RuntimeIdentifier.StartsWith('sles'))">

          <PropertyGroup>

            <TargetsSles>true</TargetsSles>

            <TargetsLinux>true</TargetsLinux>

    @@ -326,10 +327,10 @@
  
      </PropertyGroup>

      <!-- Use actual publishable (non-dummy) package name produced by the build system for this RID -->

      <PropertyGroup Condition="'$(OutputRid)' != ''">

        <PackageTargetRid>$(OutputRid)</PackageTargetRid>

        <PackageTargetRid Condition="'$(OutputRid)' == 'osx.10.11-x64'">osx.10.10-x64</PackageTargetRid>

        <PackageTargetRid Condition="$(OutputRid.StartsWith('rhel.7.')) and $(OutputRid.EndsWith('-x64'))">rhel.7-x64</PackageTargetRid>

      <PropertyGroup Condition="'$(RuntimeIdentifier)' != ''">

        <PackageTargetRid>$(RuntimeIdentifier)</PackageTargetRid>

        <PackageTargetRid Condition="'$(RuntimeIdentifier)' == 'osx.10.11-x64'">osx.10.10-x64</PackageTargetRid>

        <PackageTargetRid Condition="$(RuntimeIdentifier.StartsWith('rhel.7.')) and $(RuntimeIdentifier.EndsWith('-x64'))">rhel.7-x64</PackageTargetRid>

      </PropertyGroup>

      <PropertyGroup Condition="'$(UsingNETSdkCompiler)' != 'true'">

Directory.Build.targets

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,74 +2,12 @@ @@
       <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
       <Import Project="$(RepositoryEngineeringDir)/DisableSourceControlManagement.targets" Condition="'$(EnableSourceLink)' == 'false'" />
-      <!-- Provide default targets which can be hooked onto or overridden as necessary -->
-      <Target Name="Pack" />
-      <UsingTask TaskName="RegenerateReadmeTable" AssemblyFile="$(LocalBuildToolsTaskFile)" />
       <PropertyGroup>
         <!--
           Define this here (not just in Versions.props) because the SDK resets it
           unconditionally in Microsoft.NETCoreSdk.BundledVersions.props.
         -->
         <NETCoreAppMaximumVersion>$(MajorVersion).$(MinorVersion)</NETCoreAppMaximumVersion>
       </PropertyGroup>
-      <!-- Common target to find all sfxproj. In a target to avoid evaluating for every project. -->
-      <Target Name="GetSharedFrameworkProjects">
-        <ItemGroup>
-          <SharedFrameworkProject Include="$(RepoRoot)pkg\**\*.sfxproj" />
-        </ItemGroup>
-      </Target>
-      <!--
-        Arcade SDK versioning is defined by static properties in a targets file: work around this by
-        moving properties based on versioning into a target.
-      -->
-      <Target Name="GetProductVersions">
-        <PropertyGroup>
-          <IncludePreReleaseLabelInPackageVersion Condition="'$(DotNetFinalVersionKind)' != 'release'">true</IncludePreReleaseLabelInPackageVersion>
-          <IncludePreReleaseLabelInPackageVersion Condition="'$(SuppressFinalPackageVersion)' == 'true'">true</IncludePreReleaseLabelInPackageVersion>
-          <IncludePreReleaseLabelInPackageVersion Condition="'$(IsShipping)' != 'true'">true</IncludePreReleaseLabelInPackageVersion>
-          <IncludeBuildNumberInPackageVersion Condition="'$(StabilizePackageVersion)' != 'true'">true</IncludeBuildNumberInPackageVersion>
-          <IncludeBuildNumberInPackageVersion Condition="'$(SuppressFinalPackageVersion)' == 'true'">true</IncludeBuildNumberInPackageVersion>
-          <IncludeBuildNumberInPackageVersion Condition="'$(IsShipping)' != 'true'">true</IncludeBuildNumberInPackageVersion>
-          <ProductVersionSuffix Condition="'$(IncludePreReleaseLabelInPackageVersion)' == 'true'">-$(VersionSuffix)</ProductVersionSuffix>
-          <ProductBandVersion Condition="'$(ProductBandVersion)' == ''">$(MajorVersion).$(MinorVersion)</ProductBandVersion>
-          <ProductionVersion Condition="'$(ProductionVersion)' == ''">$(ProductBandVersion).$(PatchVersion)</ProductionVersion>
-          <ProductVersion>$(ProductionVersion)$(ProductVersionSuffix)</ProductVersion>
-          <SharedFrameworkNugetVersion>$(ProductVersion)</SharedFrameworkNugetVersion>
-          <NuGetVersion>$(SharedFrameworkNugetVersion)</NuGetVersion>
-          <InstallersRelativePath>WindowsDesktop/$(SharedFrameworkNugetVersion)/</InstallersRelativePath>
-        </PropertyGroup>
-        <PropertyGroup Condition="'$(OutputRid)' != ''">
-          <ProductMoniker>$(SharedFrameworkNugetVersion)-$(PackageTargetRid)</ProductMoniker>
-          <HostResolverVersionMoniker>$(HostResolverVersion)-$(PackageTargetRid)</HostResolverVersionMoniker>
-        </PropertyGroup>
-      </Target>
-      <!-- Target used by shared framework tooling SDK, but only for NETCoreApp properties. Stub. -->
-      <Target Name="GetInstallerLocations"
-              DependsOnTargets="GetProductVersions" />
-      <Target Name="GetLatestCommitHash"
-              Condition="'$(LatestCommit)' == ''">
-        <!-- Get the latest commit hash -->
-        <Exec Command="git rev-parse HEAD 2>&amp;1" StandardOutputImportance="Low" IgnoreExitCode="true" IgnoreStandardErrorWarningFormat="true" ConsoleToMSBuild="true">
-          <Output TaskParameter="ConsoleOutput" PropertyName="LatestCommit" />
-          <Output TaskParameter="ExitCode" PropertyName="LatestCommitExitCode" />
-        </Exec>
-        <!-- We shouldn't fail the build if we can't retreive the commit hash, so in this case just set it to N/A -->
-        <PropertyGroup Condition="'$(LatestCommitExitCode)'!='0'">
-          <LatestCommit>N/A</LatestCommit>
-        </PropertyGroup>
-      </Target>
     </Project>

Subsets.props

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -39,21 +39,11 @@
  
      <ItemGroup>

        <SubsetName

          Include="depproj"

          Description="The dependency projects. These gather shared framework files and run crossgen on them to turn them into ready-to-run (R2R) assemblies for the current platform." />

      </ItemGroup>

      <ItemGroup Condition="'$(SubsetToLower)' == '' or $(SubsetToLower.Contains('depproj'))">

        <DepprojProjectToBuild Include="$(RepoRoot)pkg\**\*.depproj" SignPhase="Binaries" />

        <ProjectToBuild Include="@(DepprojProjectToBuild)" />

      </ItemGroup>

      <ItemGroup>

        <SubsetName

          Include="pkgproj"

          Include="Packages"

          Description="The packaging projects. These produce NETCoreApp and WindowsDesktop assets: NuGet packages, installers, zips, and Linux packages." />

      </ItemGroup>

      <ItemGroup Condition="'$(SubsetToLower)' == '' or $(SubsetToLower.Contains('pkgproj'))">

        <PkgprojProjectToBuild Include="$(RepoRoot)pkg\**\*.pkgproj" SignPhase="MsiFiles" />

      <ItemGroup Condition="'$(SubsetToLower)' == '' or $(SubsetToLower.Contains('packages'))">

        <PkgprojProjectToBuild Include="$(RepoRoot)pkg\**\*.sfxproj" SignPhase="MsiFiles" />

        <ProjectToBuild Include="@(PkgprojProjectToBuild)" />

      </ItemGroup>

    @@ -67,17 +57,6 @@
  
        <ProjectToBuild Include="@(BundleProjectToBuild)" />

      </ItemGroup>

      <ItemGroup>

        <SubsetName

          Include="Installer"

          Description="Creates final installer files. Signs the burn bundle, including engine, and produces NuGet packages for VS insertion." />

      </ItemGroup>

      <ItemGroup Condition="'$(SubsetToLower)' == '' or $(SubsetToLower.Contains('installer'))">

        <InstallerProjectToBuild Include="$(RepoRoot)pkg\signed-bundle\signed-bundle.proj" />

        <InstallerProjectToBuild Include="$(RepoRoot)pkg\vs-insertion-packages\vs-insertion-packages.proj" />

        <ProjectToBuild Include="@(InstallerProjectToBuild)" />

      </ItemGroup>

      <ItemGroup>

        <SubsetName

          Include="Badge"

eng/Version.Details.xml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -121,7 +121,7 @@
  
          <Uri>https://github.com/dotnet/runtime</Uri>

          <Sha>f56a56f90ff9124c85e4d889faeeca0824d2d437</Sha>

        </Dependency>

        <Dependency Name="Microsoft.NETCore.App.Internal" Version="6.0.0-alpha.1.20561.11" CoherentParentDependency="Microsoft.Private.Winforms">

        <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-alpha.1.20561.11" CoherentParentDependency="Microsoft.Private.Winforms">

          <Uri>https://github.com/dotnet/runtime</Uri>

          <Sha>f56a56f90ff9124c85e4d889faeeca0824d2d437</Sha>

        </Dependency>

    @@ -143,11 +143,19 @@
  
          <Uri>https://github.com/dotnet/arcade</Uri>

          <Sha>4c8515c18ebe0071c32fed467ee3890fbd488898</Sha>

        </Dependency>

        <Dependency Name="Microsoft.DotNet.SharedFramework" Version="6.0.0-beta.20630.2">

          <Uri>https://github.com/dotnet/arcade</Uri>

          <Sha>4c8515c18ebe0071c32fed467ee3890fbd488898</Sha>

        </Dependency>

        <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.20630.2">

          <Uri>https://github.com/dotnet/arcade</Uri>

          <Sha>4c8515c18ebe0071c32fed467ee3890fbd488898</Sha>

        </Dependency>

        <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.20630.2">

          <Uri>https://github.com/dotnet/arcade</Uri>

          <Sha>4c8515c18ebe0071c32fed467ee3890fbd488898</Sha>

        </Dependency>

        <Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="6.0.0-beta.20630.2">

        <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.20630.2">

          <Uri>https://github.com/dotnet/arcade</Uri>

          <Sha>4c8515c18ebe0071c32fed467ee3890fbd488898</Sha>

        </Dependency>

eng/Versions.props

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -40,11 +40,13 @@
  
      <PropertyGroup>

        <!-- arcade -->

        <MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.20630.2</MicrosoftDotNetBuildTasksFeedVersion>

        <MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.20630.2</MicrosoftDotNetBuildTasksArchivesVersion>

        <MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.20630.2</MicrosoftDotNetBuildTasksPackagingVersion>

        <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.20630.2</MicrosoftDotNetBuildTasksInstallersVersion>

        <MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.20630.2</MicrosoftDotNetVersionToolsTasksVersion>

        <!-- core-setup -->

        <MicrosoftNETCoreAppRefVersion>6.0.0-alpha.1.20561.11</MicrosoftNETCoreAppRefVersion>

        <MicrosoftNETCoreAppInternalVersion>6.0.0-alpha.1.20561.11</MicrosoftNETCoreAppInternalVersion>

        <VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-alpha.1.20561.11</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>

        <MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-alpha.1.20561.11</MicrosoftNETCoreAppRuntimewinx64Version>

        <!-- corefx -->

        <MicrosoftNETCorePlatformsVersion>6.0.0-alpha.1.20561.11</MicrosoftNETCorePlatformsVersion>

global.json

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ @@
       },
       "msbuild-sdks": {
         "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20630.2",
-        "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "6.0.0-beta.20630.2"
+        "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.20630.2",
+        "Microsoft.Build.NoTargets": "1.0.53"
       }
     }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Switch to new Microsoft.DotNet.SharedFramework.Sdk #909

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!