Merge remote-tracking branch 'upstream/release/5.0.2xx' into internal/release/5.0.2xx
This commit is contained in:
Matt Mitchell
commit
8d98875ae2
4 changed files with 14 additions and 49 deletions
47
NuGet.config
47
NuGet.config
|
|
@ -7,37 +7,19 @@
|
|||
<clear />
|
||||
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
|
||||
<!-- Begin: Package sources from dotnet-aspnetcore -->
|
||||
<add key="darc-int-dotnet-aspnetcore-dc5e11a-2" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-dc5e11ab-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-aspnetcore-dc5e11a-1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-dc5e11ab-1/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-aspnetcore-dc5e11a" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-dc5e11ab/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||
<!-- Begin: Package sources from dotnet-efcore -->
|
||||
<add key="darc-int-dotnet-efcore-42e8143-2" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-42e81439-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-efcore-42e8143-1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-42e81439-1/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-efcore-42e8143" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-42e81439/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-efcore -->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<add key="darc-int-dotnet-runtime-478b2f8-4" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-478b2f8c-4/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-runtime-478b2f8-3" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-478b2f8c-3/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-runtime-478b2f8-2" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-478b2f8c-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-runtime-478b2f8-1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-478b2f8c-1/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-runtime-478b2f8" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-478b2f8c/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-msbuild -->
|
||||
<!-- End: Package sources from dotnet-msbuild -->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-templating -->
|
||||
<add key="darc-pub-dotnet-templating-3cdb186" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-3cdb1866/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-templating -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-297185f-4" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-windowsdesktop-297185fc-4/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-297185f-3" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-windowsdesktop-297185fc-3/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-297185f-2" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-windowsdesktop-297185fc-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-297185f-1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-windowsdesktop-297185fc-1/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-297185f" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-windowsdesktop-297185fc/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-windowsdesktop -->
|
||||
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
|
||||
<!-- For custom version of arcade -->
|
||||
<add key="general-testing" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json" />
|
||||
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
|
||||
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
|
||||
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
|
||||
|
|
@ -50,32 +32,15 @@
|
|||
<clear />
|
||||
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
|
||||
<!-- Begin: Package sources from dotnet-aspnetcore -->
|
||||
<add key="darc-int-dotnet-aspnetcore-dc5e11a" value="true" />
|
||||
<add key="darc-int-dotnet-aspnetcore-dc5e11a-1" value="true" />
|
||||
<add key="darc-int-dotnet-aspnetcore-dc5e11a-2" value="true" />
|
||||
<!-- Begin: Package sources from dotnet-efcore -->
|
||||
<add key="darc-int-dotnet-efcore-42e8143" value="true" />
|
||||
<add key="darc-int-dotnet-efcore-42e8143-1" value="true" />
|
||||
<add key="darc-int-dotnet-efcore-42e8143-2" value="true" />
|
||||
<!-- End: Package sources from dotnet-efcore -->
|
||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||
<!-- Begin: Package sources from dotnet-efcore -->
|
||||
<!-- End: Package sources from dotnet-efcore -->
|
||||
<!-- Begin: Package sources from dotnet-msbuild -->
|
||||
<!-- End: Package sources from dotnet-msbuild -->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<add key="darc-int-dotnet-runtime-478b2f8" value="true" />
|
||||
<add key="darc-int-dotnet-runtime-478b2f8-1" value="true" />
|
||||
<add key="darc-int-dotnet-runtime-478b2f8-2" value="true" />
|
||||
<add key="darc-int-dotnet-runtime-478b2f8-3" value="true" />
|
||||
<add key="darc-int-dotnet-runtime-478b2f8-4" value="true" />
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-297185f" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-297185f-1" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-297185f-2" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-297185f-3" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-297185f-4" value="true" />
|
||||
<!-- End: Package sources from dotnet-windowsdesktop -->
|
||||
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
|
||||
<!-- Added by darc above. due to dependencies on 3.0.0 and 2.1.0 packs, but we can get those from nuget.org -->
|
||||
<!-- Darc will just put it back if we attempt to remove it above. -->
|
||||
<add key="darc-pub-dotnet-core-setup-7d57652" value="true" />
|
||||
</disabledPackageSources>
|
||||
</configuration>
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
Basically: In this file, choose the highest version when resolving merge conflicts.
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.15</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
|
||||
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.15</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
|
||||
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.15</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
|
||||
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.16</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
|
||||
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.16</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
|
||||
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.16</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<VersionMajor>5</VersionMajor>
|
||||
<VersionMinor>0</VersionMinor>
|
||||
<VersionSDKMinor>2</VersionSDKMinor>
|
||||
<VersionFeature>03</VersionFeature>
|
||||
<VersionFeature>04</VersionFeature>
|
||||
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
|
||||
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
|
||||
<MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
|
||||
|
|
@ -103,10 +103,10 @@
|
|||
<MicrosoftDotnetWinFormsProjectTemplates31PackageVersion>4.8.1-servicing.19605.5</MicrosoftDotnetWinFormsProjectTemplates31PackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplates31PackageVersion>3.1.2-servicing.20066.4</MicrosoftDotNetWpfProjectTemplates31PackageVersion>
|
||||
<NUnit3Templates31PackageVersion>1.7.2</NUnit3Templates31PackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplates31PackageVersion>3.1.10</MicrosoftDotNetCommonItemTemplates31PackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplates31PackageVersion>3.1.15</MicrosoftDotNetCommonItemTemplates31PackageVersion>
|
||||
<MicrosoftDotNetCommonProjectTemplates31PackageVersion>$(MicrosoftDotNetCommonItemTemplates31PackageVersion)</MicrosoftDotNetCommonProjectTemplates31PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates31PackageVersion>$(MicrosoftDotNetTestProjectTemplates50PackageVersion)</MicrosoftDotNetTestProjectTemplates31PackageVersion>
|
||||
<AspNetCorePackageVersionFor31Templates>3.1.14</AspNetCorePackageVersionFor31Templates>
|
||||
<AspNetCorePackageVersionFor31Templates>3.1.15</AspNetCorePackageVersionFor31Templates>
|
||||
<MicrosoftAspNetCoreComponentsWebAssemblyTemplatesPackageVersion>3.2.1</MicrosoftAspNetCoreComponentsWebAssemblyTemplatesPackageVersion>
|
||||
<!-- 3.0 Template versions -->
|
||||
<MicrosoftDotnetWinFormsProjectTemplates30PackageVersion>4.8.0-rc2.19462.10</MicrosoftDotnetWinFormsProjectTemplates30PackageVersion>
|
||||
|
|
@ -121,7 +121,7 @@
|
|||
<MicrosoftDotNetCommonItemTemplates21PackageVersion>1.0.2-beta3</MicrosoftDotNetCommonItemTemplates21PackageVersion>
|
||||
<MicrosoftDotNetCommonProjectTemplates21PackageVersion>$(MicrosoftDotNetCommonItemTemplates21PackageVersion)</MicrosoftDotNetCommonProjectTemplates21PackageVersion>
|
||||
<MicrosoftDotNetTestProjectTemplates21PackageVersion>1.0.2-beta4.20420.1</MicrosoftDotNetTestProjectTemplates21PackageVersion>
|
||||
<AspNetCorePackageVersionFor21Templates>2.1.27</AspNetCorePackageVersionFor21Templates>
|
||||
<AspNetCorePackageVersionFor21Templates>2.1.28</AspNetCorePackageVersionFor21Templates>
|
||||
</PropertyGroup>
|
||||
<!-- infrastructure and test only dependencies -->
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
-TsaProjectName DEVDIV
|
||||
-TsaNotificationEmail dotnetdevexcli@microsoft.com
|
||||
-TsaCodebaseAdmin REDMOND\marcpop
|
||||
-TsaBugAreaPath "DevDiv\NET Tools\CLI"
|
||||
-TsaBugAreaPath "DevDiv\NET Tools\SDK"
|
||||
-TsaIterationPath DevDiv
|
||||
-TsaRepositoryName dotnet-installer
|
||||
-TsaCodebaseName dotnet-installer
|
||||
|
|
|
|||
Loading…
Reference in a new issue