Minor formatting fixes. TODO comments for tracking versions/packages.
This commit is contained in:
parent
bec677e68a
commit
756e6e0dcc
3 changed files with 21 additions and 16 deletions
|
@ -1,12 +1,12 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<Project>
|
||||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
|
|
||||||
<!-- The following properties (unlike those in version.props) are maintained manually. So
|
<!--
|
||||||
when there is a merge conflict, the highest version should generally be chosen, rather
|
The following properties (unlike those in version.props) are maintained manually. So
|
||||||
than keeping what's in the branch, which is the usual strategy with version.props merge
|
when there is a merge conflict, the highest version should generally be chosen, rather
|
||||||
conflicts.
|
than keeping what's in the branch, which is the usual strategy with version.props merge
|
||||||
|
conflicts.
|
||||||
Basically: In this file, choose the highest version when resolving merge conflicts.
|
|
||||||
|
Basically: In this file, choose the highest version when resolving merge conflicts.
|
||||||
-->
|
-->
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.31</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
|
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.31</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
|
||||||
|
@ -16,4 +16,5 @@
|
||||||
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.31</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
|
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.31</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
|
||||||
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.31</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
|
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.31</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -76,13 +76,14 @@
|
||||||
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-alpha.1.23558.19</MicrosoftAspNetCoreAppRefPackageVersion>
|
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-alpha.1.23558.19</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-alpha.1.23558.19</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-alpha.1.23558.19</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||||
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-alpha.1.23558.19</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
|
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-alpha.1.23558.19</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
|
||||||
<dotnetdevcertsPackageVersion>9.0.0-alpha.1.23558.19</dotnetdevcertsPackageVersion>
|
<DotnetDevCertsPackageVersion>9.0.0-alpha.1.23558.19</DotnetDevCertsPackageVersion>
|
||||||
<dotnetuserjwtsPackageVersion>9.0.0-alpha.1.23558.19</dotnetuserjwtsPackageVersion>
|
<DotnetUserJwtsPackageVersion>9.0.0-alpha.1.23558.19</DotnetUserJwtsPackageVersion>
|
||||||
<dotnetusersecretsPackageVersion>9.0.0-alpha.1.23558.19</dotnetusersecretsPackageVersion>
|
<DotnetUserSecretsPackageVersion>9.0.0-alpha.1.23558.19</DotnetUserSecretsPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
|
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<!-- TODO -->
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-alpha.1.23559.2</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
<MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-alpha.1.23559.2</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||||
|
@ -118,8 +119,7 @@
|
||||||
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-alpha.1.23558.4</MicrosoftWindowsDesktopAppRefPackageVersion>
|
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-alpha.1.23558.4</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->
|
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 version above and create aliases without the winx64 here for clarity elsewhere. -->
|
||||||
<!-- version above and create aliases without the winx64 here for clarity elsewhere. -->
|
|
||||||
<MicrosoftNETCoreAppHostPackageVersion>$(MicrosoftNETCoreAppHostwinx64PackageVersion)</MicrosoftNETCoreAppHostPackageVersion>
|
<MicrosoftNETCoreAppHostPackageVersion>$(MicrosoftNETCoreAppHostwinx64PackageVersion)</MicrosoftNETCoreAppHostPackageVersion>
|
||||||
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
|
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
|
||||||
<MicrosoftAspNetCoreAppRuntimePackageVersion>$(MicrosoftAspNetCoreAppRuntimewinx64PackageVersion)</MicrosoftAspNetCoreAppRuntimePackageVersion>
|
<MicrosoftAspNetCoreAppRuntimePackageVersion>$(MicrosoftAspNetCoreAppRuntimewinx64PackageVersion)</MicrosoftAspNetCoreAppRuntimePackageVersion>
|
||||||
|
@ -134,6 +134,7 @@
|
||||||
<MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.23509.2</MicrosoftDeploymentDotNetReleasesVersion>
|
<MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.23509.2</MicrosoftDeploymentDotNetReleasesVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
<!-- TODO -->
|
||||||
<!-- Automated versions for asp.net templates -->
|
<!-- Automated versions for asp.net templates -->
|
||||||
<!-- Grab just the patch version from MicrosoftNETSdkPackageVersion (7.0.103-servicing becomes 03) -->
|
<!-- Grab just the patch version from MicrosoftNETSdkPackageVersion (7.0.103-servicing becomes 03) -->
|
||||||
<MicrosoftNETSdkFeatureAndPatchVersion>$(MicrosoftNETSdkPackageVersion.Split('.')[2])</MicrosoftNETSdkFeatureAndPatchVersion>
|
<MicrosoftNETSdkFeatureAndPatchVersion>$(MicrosoftNETSdkPackageVersion.Split('.')[2])</MicrosoftNETSdkFeatureAndPatchVersion>
|
||||||
|
@ -184,7 +185,9 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- 9.0 Template versions -->
|
<!-- 9.0 Template versions -->
|
||||||
<AspNetCorePackageVersionFor90Templates>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCorePackageVersionFor90Templates>
|
<AspNetCorePackageVersionFor90Templates>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCorePackageVersionFor90Templates>
|
||||||
|
<!-- TODO -->
|
||||||
<MicrosoftDotNetCommonItemTemplates90PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonItemTemplates90PackageVersion>
|
<MicrosoftDotNetCommonItemTemplates90PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonItemTemplates90PackageVersion>
|
||||||
|
<!-- TODO -->
|
||||||
<MicrosoftDotNetCommonProjectTemplates90PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonProjectTemplates90PackageVersion>
|
<MicrosoftDotNetCommonProjectTemplates90PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonProjectTemplates90PackageVersion>
|
||||||
<MicrosoftDotnetWinFormsProjectTemplates90PackageVersion>$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)</MicrosoftDotnetWinFormsProjectTemplates90PackageVersion>
|
<MicrosoftDotnetWinFormsProjectTemplates90PackageVersion>$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)</MicrosoftDotnetWinFormsProjectTemplates90PackageVersion>
|
||||||
<MicrosoftDotNetWpfProjectTemplates90PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates90PackageVersion>
|
<MicrosoftDotNetWpfProjectTemplates90PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates90PackageVersion>
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<PropertyGroup>
|
|
||||||
|
<PropertyGroup>
|
||||||
<TargetFramework>$(CoreSdkTargetFramework)</TargetFramework>
|
<TargetFramework>$(CoreSdkTargetFramework)</TargetFramework>
|
||||||
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
|
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
|
||||||
<CopyBuildOutputToPublishDirectory>false</CopyBuildOutputToPublishDirectory>
|
<CopyBuildOutputToPublishDirectory>false</CopyBuildOutputToPublishDirectory>
|
||||||
|
@ -33,7 +34,6 @@
|
||||||
<Import Project="targets\GenerateLayout.targets" />
|
<Import Project="targets\GenerateLayout.targets" />
|
||||||
<Import Project="targets\GenerateMSBuildExtensions.targets" />
|
<Import Project="targets\GenerateMSBuildExtensions.targets" />
|
||||||
<Import Project="targets\FileExtensions.targets" />
|
<Import Project="targets\FileExtensions.targets" />
|
||||||
|
|
||||||
<Import Project="targets\GenerateArchives.targets" />
|
<Import Project="targets\GenerateArchives.targets" />
|
||||||
<Import Project="targets\GenerateMSIs.targets" />
|
<Import Project="targets\GenerateMSIs.targets" />
|
||||||
<Import Project="targets\LinuxNativeInstallerDependencyVersions.targets" />
|
<Import Project="targets\LinuxNativeInstallerDependencyVersions.targets" />
|
||||||
|
@ -42,4 +42,5 @@
|
||||||
<Import Project="targets\GeneratePKG.targets" />
|
<Import Project="targets\GeneratePKG.targets" />
|
||||||
<Import Project="targets\GenerateInstallers.targets" />
|
<Import Project="targets\GenerateInstallers.targets" />
|
||||||
<Import Project="targets\Badge.targets" />
|
<Import Project="targets\Badge.targets" />
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
Loading…
Reference in a new issue