Merging internal commits for release/6.0.1xx (#13812)
* Merged PR 22398: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies
[marker]: <> (Begin:Coherency Updates)
## Coherency Updates
The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)
[DependencyUpdate]: <> (Begin)
- **Coherency Updates**:
- **Microsoft.WindowsDesktop.App.Ref**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
- **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.4-servicing.22165.2 to 6.0.5-servicing.22213.4 (parent: Microsoft.NET.Sdk)
- **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.4-servicing.22165.2 to 6.0.5-servicing.22213.4 (parent: Microsoft.NET.Sdk)
- **Microsoft.NETCore.App.Ref**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
- **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.4-servicing.22164.4 to 6.0.5-servicing.22213.9 (parent: Microsoft.NET.Sdk)
- **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
- **Microsoft.NETCore.App.Host.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
- **Microsoft.NETCore.DotNetHostResolver**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
- **Microsoft.AspNetCore.App.Ref**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
- **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22214.12 (parent: Microsoft.NET.Sdk)
- **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
- **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22214.12 (parent: Microsoft.NET.Sdk)
- **dotnet-dev-certs**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22214.12 (parent: Microsoft.NET.Sdk)
- **dotnet-user-secrets**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22214.12 (parent: Microsoft.NET.Sdk)
- **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.104 to 6.0.105 (parent: Microsoft.NET.Sdk)
- **Microsoft.TemplateEngine.Cli**: from 6.0.104-servicing.22164.8 to 6.0.105-servicing.22214.6 (parent: Microsoft.NET.Sdk)
- **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.104 to 6.0.105 (parent: Microsoft.NET.Sdk)
- **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
- **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
- **Microsoft.Net.Compilers.Toolset**: from 4.0.1-1.22157.22 to 4.0.1-1.22181.2 (parent: Microsoft.NET.Sdk)
- **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22164.4 to 6.0.5-servicing.22213.9 (parent: Microsoft.NET.Sdk)
[DependencyUpdate]: <> (End)
[marker]: <> (End:Coherency Updates)
[marker]: <> (Begin:a68e208b-7b...
* Merged PR 22415: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies
[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20220418.14
- **Date Produced**: April 18, 2022 10:36:29 PM UTC
- **Commit**: e910b873d7d62011eb83d9ec9ad2ad09e4a1a2fb
- **Branch**: refs/heads/internal/release/6.0.1xx
[DependencyUpdate]: <> (Begin)
- **Updates**:
- **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.105-servicing.22217.2 to 6.0.105-servicing.22218.14][1]
- **Microsoft.NET.Sdk**: [from 6.0.105-servicing.22217.2 to 6.0.105-servicing.22218.14][1]
[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC7882da0&targetVersion=GCe910b87&_a=files
[DependencyUpdate]: <> (End)
[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
* Merged PR 22459: Update source-build to AspNetCoreSharedFxInstallerRid property rename
AspNetCoreSharedFxInstallerRid was renamed to AspNetCoreInstallerRid in 7ce479f5e7.
* Merged PR 22507: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies
[marker]: <> (Begin:Coherency Updates)
## Coherency Updates
The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)
[DependencyUpdate]: <> (Begin)
- **Coherency Updates**:
- **Microsoft.WindowsDesktop.App.Ref**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk)
- **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.5-servicing.22213.4 to 6.0.5-servicing.22215.11 (parent: Microsoft.NET.Sdk)
- **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.5-servicing.22213.4 to 6.0.5-servicing.22215.11 (parent: Microsoft.NET.Sdk)
- **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk)
- **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk)
- **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.4-servicing.22165.3 to 6.0.5-servicing.22215.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
[DependencyUpdate]: <> (End)
[marker]: <> (End:Coherency Updates)
[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20220420.15
- **Date Produced**: April 20, 2022 5:24:23 PM UTC
- **Commit**: 0ad59d00ed13d3b5cd1343efb4dde64714f70063
- **Branch**: refs/heads/internal/release/6.0.1xx
[DependencyUpdate]: <> (Begin)
- **Updates**:
- **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.105-servicing.22218.14 to 6.0.105-servicing.22220.15][1]
- **Microsoft.NET.Sdk**: [from 6.0.105-servicing.22218.14 to 6.0.105-servicing.22220.15][1]
- **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.5 to 6.0.5][2]
- **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.5-servicing.22213.4 to 6.0.5-servicing.22215.11][2]
- **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.5-servicing.22213.4 to 6.0.5-servicing.22215.11][2]
- **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.5 to 6.0.5][2]
- **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.5 to 6.0.5][2]
- **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.4-servicing.22165.3 to 6.0.5-servicing.22215.9][3]
[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCe910b87&targetVersion=GC0ad59d0&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC0636f1e&targetVersion=GCad94063&_a=files
[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCfcb07d6&targetVersion=GC14bf2e5&_a=files
[DependencyUpdate]: <> (End)
[marker]: <> (End:a68e208...
* Merged PR 22538: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies
[marker]: <> (Begin:Coherency Updates)
## Coherency Updates
The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)
[DependencyUpdate]: <> (Begin)
- **Coherency Updates**:
- **Microsoft.AspNetCore.App.Ref**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk)
- **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)
- **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk)
- **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)
- **dotnet-dev-certs**: from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)
- **dotnet-user-secrets**: from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)
[DependencyUpdate]: <> (End)
[marker]: <> (End:Coherency Updates)
[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20220421.11
- **Date Produced**: April 21, 2022 4:12:47 PM UTC
- **Commit**: ce948f426d1c884d4a7315bd4d745590a797bd48
- **Branch**: refs/heads/internal/release/6.0.1xx
[DependencyUpdate]: <> (Begin)
- **Updates**:
- **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.105-servicing.22220.15 to 6.0.105-servicing.22221.11][1]
- **Microsoft.NET.Sdk**: [from 6.0.105-servicing.22220.15 to 6.0.105-servicing.22221.11][1]
- **Microsoft.AspNetCore.App.Ref**: [from 6.0.5 to 6.0.5][2]
- **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2][2]
- **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.5 to 6.0.5][2]
- **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2][2]
- **dotnet-dev-certs**: [from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2][2]
- **dotnet-user-secrets**: [from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2][2]
[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC0ad59d0&targetVersion=GCce948f4&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCdd34abd&targetVersion=GCe5f183b&_a=files
[DependencyUpdate]: <> (End)
[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
Co-authored-by: DotNet Bot <dn-bot@microsoft.com>
Co-authored-by: Michael Simons (VISUAL STUDIO) <Michael.Simons@microsoft.com>
This commit is contained in:
vseanreesermsft
GitHub
parent
953ad15c5b
commit
72a85dfc6a
6 changed files with 88 additions and 194 deletions
|
|
@ -7,16 +7,20 @@
|
|||
<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-e5f183b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-e5f183b6/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||
<!-- Begin: Package sources from dotnet-emsdk -->
|
||||
<!-- End: Package sources from dotnet-emsdk -->
|
||||
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
|
||||
<!-- End: Package sources from DotNet-msbuild-Trusted -->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<add key="darc-int-dotnet-runtime-70ae3df" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-70ae3df4/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-templating -->
|
||||
<add key="darc-int-dotnet-templating-23779e3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-23779e3d/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-templating -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-ad94063" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-ad940638/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-windowsdesktop -->
|
||||
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
|
||||
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
|
||||
|
|
@ -37,11 +41,15 @@
|
|||
<disabledPackageSources>
|
||||
<!--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-e5f183b" value="true" />
|
||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<add key="darc-int-dotnet-runtime-70ae3df" value="true" />
|
||||
<!-- Begin: Package sources from dotnet-templating -->
|
||||
<add key="darc-int-dotnet-templating-23779e3" value="true" />
|
||||
<!-- End: Package sources from dotnet-templating -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-ad94063" value="true" />
|
||||
<!-- End: Package sources from dotnet-windowsdesktop -->
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
|
|
|
|||
|
|
@ -1,46 +1,46 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Dependencies>
|
||||
<ProductDependencies>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>167140c0529a64c91f7a82249583ce27e52d28dd</Sha>
|
||||
<Sha>ad940638f459efe0d17d60ccf52454a32ea7e561</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.4-servicing.22165.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.5-servicing.22215.11" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>167140c0529a64c91f7a82249583ce27e52d28dd</Sha>
|
||||
<Sha>ad940638f459efe0d17d60ccf52454a32ea7e561</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.4-servicing.22165.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.5-servicing.22215.11" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>167140c0529a64c91f7a82249583ce27e52d28dd</Sha>
|
||||
<Sha>ad940638f459efe0d17d60ccf52454a32ea7e561</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>167140c0529a64c91f7a82249583ce27e52d28dd</Sha>
|
||||
<Sha>ad940638f459efe0d17d60ccf52454a32ea7e561</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.4-servicing.22164.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.5-servicing.22213.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha>
|
||||
<Sha>70ae3df4a6f3c92fb6b315afc405edd10ff38579</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha>
|
||||
<Sha>70ae3df4a6f3c92fb6b315afc405edd10ff38579</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.4-servicing.22164.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.6.0" Version="6.0.5-servicing.22213.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha>
|
||||
<Sha>70ae3df4a6f3c92fb6b315afc405edd10ff38579</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha>
|
||||
<Sha>70ae3df4a6f3c92fb6b315afc405edd10ff38579</Sha>
|
||||
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha>
|
||||
<Sha>70ae3df4a6f3c92fb6b315afc405edd10ff38579</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha>
|
||||
<Sha>70ae3df4a6f3c92fb6b315afc405edd10ff38579</Sha>
|
||||
</Dependency>
|
||||
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
|
||||
<!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
|
||||
|
|
@ -52,30 +52,30 @@
|
|||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||
<Sha>f9ae0f5d30be2de3c0de61b5673bd8873231d70a</Sha>
|
||||
<Sha>e5f183b656a0e8bc087108130a5a9b54ae94494e</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.4-servicing.22172.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.5-servicing.22218.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||
<Sha>f9ae0f5d30be2de3c0de61b5673bd8873231d70a</Sha>
|
||||
<Sha>e5f183b656a0e8bc087108130a5a9b54ae94494e</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||
<Sha>f9ae0f5d30be2de3c0de61b5673bd8873231d70a</Sha>
|
||||
<Sha>e5f183b656a0e8bc087108130a5a9b54ae94494e</Sha>
|
||||
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.4-servicing.22172.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.5-servicing.22218.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||
<Sha>f9ae0f5d30be2de3c0de61b5673bd8873231d70a</Sha>
|
||||
<Sha>e5f183b656a0e8bc087108130a5a9b54ae94494e</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-dev-certs" Version="6.0.4-servicing.22172.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-dev-certs" Version="6.0.5-servicing.22218.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||
<Sha>f9ae0f5d30be2de3c0de61b5673bd8873231d70a</Sha>
|
||||
<Sha>e5f183b656a0e8bc087108130a5a9b54ae94494e</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-secrets" Version="6.0.4-servicing.22172.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-user-secrets" Version="6.0.5-servicing.22218.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||
<Sha>f9ae0f5d30be2de3c0de61b5673bd8873231d70a</Sha>
|
||||
<Sha>e5f183b656a0e8bc087108130a5a9b54ae94494e</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22064.3">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
|
|
@ -90,36 +90,36 @@
|
|||
<Sha>c40ef7e056b48e011c43a21354d6790ba6b8b4fc</Sha>
|
||||
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.104" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.105" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
||||
<Sha>753321ed7aa6f20eb66b98a7f0e9f6b6f7c57950</Sha>
|
||||
<Sha>23779e3dc3d8b0a8a35639e352d96cfc0a81d0ed</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.104-servicing.22164.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.105-servicing.22214.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
||||
<Sha>753321ed7aa6f20eb66b98a7f0e9f6b6f7c57950</Sha>
|
||||
<Sha>23779e3dc3d8b0a8a35639e352d96cfc0a81d0ed</Sha>
|
||||
<SourceBuild RepoName="templating" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.104" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.105" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
|
||||
<Sha>753321ed7aa6f20eb66b98a7f0e9f6b6f7c57950</Sha>
|
||||
<Sha>23779e3dc3d8b0a8a35639e352d96cfc0a81d0ed</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.104-servicing.22172.6">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.105-servicing.22221.11">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>50e695e438ba9f826633d4127d891d53fd972314</Sha>
|
||||
<Sha>ce948f426d1c884d4a7315bd4d745590a797bd48</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.104-servicing.22172.6">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.105-servicing.22221.11">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>50e695e438ba9f826633d4127d891d53fd972314</Sha>
|
||||
<Sha>ce948f426d1c884d4a7315bd4d745590a797bd48</Sha>
|
||||
</Dependency>
|
||||
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.4-servicing.22164.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
|
||||
<Sha>0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.4-servicing.22165.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.5-servicing.22215.9" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
|
||||
<Sha>fcb07d637abf53791e2c55c63d9207fc3232fe83</Sha>
|
||||
<Sha>14bf2e54800ba75bfd06cbb4f2e470cbfffc9a5b</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.0-beta.21522.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
|
|
@ -141,9 +141,9 @@
|
|||
<SourceBuild RepoName="linker" ManagedOnly="true" />
|
||||
<RepoName>linker</RepoName>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.1-1.22157.22" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.1-1.22181.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/roslyn</Uri>
|
||||
<Sha>27d9215906a62c0a550ba19cd275a2dc94ad88b3</Sha>
|
||||
<Sha>487283bcd8d66693091f2800dcf1c8ae37cccdee</Sha>
|
||||
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Build" Version="17.0.0" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/wpf -->
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.4-servicing.22165.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.5-servicing.22215.9</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/templating -->
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.104</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.105</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/test-templates -->
|
||||
|
|
@ -44,20 +44,20 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.4</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>6.0.4</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.4-servicing.22172.4</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.4-servicing.22172.4</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>6.0.4-servicing.22172.4</dotnetdevcertsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>6.0.4-servicing.22172.4</dotnetusersecretsPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.5</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>6.0.5</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.5-servicing.22218.2</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.5-servicing.22218.2</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>6.0.5-servicing.22218.2</dotnetdevcertsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>6.0.5-servicing.22218.2</dotnetusersecretsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftNETSdkPackageVersion>6.0.104-servicing.22172.6</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.104-servicing.22172.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>6.0.105-servicing.22221.11</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.105-servicing.22221.11</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
|
|
@ -68,20 +68,20 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/core-setup -->
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.4-servicing.22164.4</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.4-servicing.22164.4</VSRedistCommonNetCoreTargetingPackx6460PackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.4</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.4</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>6.0.4</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.5-servicing.22213.9</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6460PackageVersion>6.0.5-servicing.22213.9</VSRedistCommonNetCoreTargetingPackx6460PackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.5</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.5</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>6.0.5</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.5</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.4-servicing.22165.2</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.4-servicing.22165.2</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.4</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>6.0.4</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.5-servicing.22215.11</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.5-servicing.22215.11</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.5</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>6.0.5</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->
|
||||
|
|
@ -113,7 +113,7 @@
|
|||
<MicrosoftDotNetWpfProjectTemplates60PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates60PackageVersion>
|
||||
<NUnit3Templates60PackageVersion>$(NUnit3DotNetNewTemplatePackageVersion)</NUnit3Templates60PackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplates60PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonItemTemplates60PackageVersion>
|
||||
<MicrosoftDotNetCommonProjectTemplates60PackageVersion>6.0.104</MicrosoftDotNetCommonProjectTemplates60PackageVersion>
|
||||
<MicrosoftDotNetCommonProjectTemplates60PackageVersion>6.0.105</MicrosoftDotNetCommonProjectTemplates60PackageVersion>
|
||||
<AspNetCorePackageVersionFor60Templates>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCorePackageVersionFor60Templates>
|
||||
<!-- 5.0 Template versions -->
|
||||
<MicrosoftDotnetWinFormsProjectTemplates50PackageVersion>$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)</MicrosoftDotnetWinFormsProjectTemplates50PackageVersion>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:Rid=$(TargetRid)</BuildCommandArgs>
|
||||
<BuildCommandArgs>$(BuildCommandArgs) /p:DOTNET_INSTALL_DIR=$(DotNetCliToolDir)</BuildCommandArgs>
|
||||
|
||||
<BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:AspNetCoreSharedFxInstallerRid=linux-$(Platform)</BuildCommandArgs>
|
||||
<BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:AspNetCoreInstallerRid=linux-$(Platform)</BuildCommandArgs>
|
||||
<!-- core-sdk always wants to build portable on OSX and FreeBSD -->
|
||||
<BuildCommandArgs Condition="'$(TargetOS)' == 'FreeBSD'">$(BuildCommandArgs) /p:CoreSetupRid=freebsd-x64 /p:PortableBuild=true</BuildCommandArgs>
|
||||
<BuildCommandArgs Condition="'$(TargetOS)' == 'OSX'">$(BuildCommandArgs) /p:CoreSetupRid=osx-x64</BuildCommandArgs>
|
||||
|
|
|
|||
|
|
@ -1,113 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: William Godbe <wigodbe@microsoft.com>
|
||||
Date: Wed, 23 Mar 2022 09:11:11 -0700
|
||||
Subject: [PATCH] Revert "Revert "[release/6.0] Build ProjectTemplates in
|
||||
Source-Build (#40650)" (#40805)"
|
||||
|
||||
This reverts commit a351c437ac7bc9f9be96de51832608438a7a37df.
|
||||
---
|
||||
Directory.Build.props | 3 +++
|
||||
Directory.Build.targets | 9 +++++++--
|
||||
.../src/Microsoft.Authentication.WebAssembly.Msal.csproj | 9 ++++++++-
|
||||
...pNetCore.Components.WebAssembly.Authentication.csproj | 9 ++++++++-
|
||||
4 files changed, 26 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/Directory.Build.props b/Directory.Build.props
|
||||
index 8f0ac59422..721f099a77 100644
|
||||
--- a/Directory.Build.props
|
||||
+++ b/Directory.Build.props
|
||||
@@ -30,6 +30,9 @@
|
||||
$(MSBuildProjectName.EndsWith('.Test')) OR
|
||||
$(MSBuildProjectName.EndsWith('.FunctionalTest')) ) ">true</IsUnitTestProject>
|
||||
<IsTestAssetProject Condition=" $(RepoRelativeProjectDir.Contains('testassets')) OR $(MSBuildProjectName.Contains('TestCommon'))">true</IsTestAssetProject>
|
||||
+ <IsProjectTemplateProject Condition=" ($(RepoRelativeProjectDir.Contains('ProjectTemplates')) OR $(MSBuildProjectName.Contains('ProjectTemplates')) ) AND
|
||||
+ '$(IsUnitTestProject)' != 'true' AND
|
||||
+ '$(IsTestAssetProject)' != 'true' ">true</IsProjectTemplateProject>
|
||||
<IsSampleProject Condition=" $(RepoRelativeProjectDir.ToUpperInvariant().Contains('SAMPLE')) ">true</IsSampleProject>
|
||||
<IsAnalyzersProject Condition="$(MSBuildProjectName.EndsWith('.Analyzers'))">true</IsAnalyzersProject>
|
||||
<IsShipping Condition=" '$(IsSampleProject)' == 'true' OR
|
||||
diff --git a/Directory.Build.targets b/Directory.Build.targets
|
||||
index a195c0fb2e..fd388a1176 100644
|
||||
--- a/Directory.Build.targets
|
||||
+++ b/Directory.Build.targets
|
||||
@@ -1,10 +1,15 @@
|
||||
<Project>
|
||||
|
||||
<PropertyGroup>
|
||||
- <!-- Only build Microsoft.AspNetCore.App, Microsoft.AspNetCore.App.Ref, and ref/ assemblies in source build. -->
|
||||
+ <!-- Only build Microsoft.AspNetCore.App, Microsoft.AspNetCore.App.Ref, ref/ assemblies, and ProjectTemplates in source build. -->
|
||||
<!-- Analyzer package are needed in source build for WebSDK -->
|
||||
<ExcludeFromSourceBuild
|
||||
- Condition="'$(ExcludeFromSourceBuild)' == '' and '$(DotNetBuildFromSource)' == 'true' and '$(IsAspNetCoreApp)' != 'true' and '$(MSBuildProjectName)' != '$(TargetingPackName)' and '$(IsAnalyzersProject)' != 'true'">true</ExcludeFromSourceBuild>
|
||||
+ Condition="'$(ExcludeFromSourceBuild)' == '' and
|
||||
+ '$(DotNetBuildFromSource)' == 'true' and
|
||||
+ '$(IsAspNetCoreApp)' != 'true' and
|
||||
+ '$(MSBuildProjectName)' != '$(TargetingPackName)' and
|
||||
+ '$(IsAnalyzersProject)' != 'true' and
|
||||
+ '$(IsProjectTemplateProject)' != 'true'">true</ExcludeFromSourceBuild>
|
||||
|
||||
<!-- If the user has specified that they want to skip building any test related projects with SkipTestBuild,
|
||||
suppress all targets for TestProjects using ExcludeFromBuild. -->
|
||||
diff --git a/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj b/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj
|
||||
index 8ae5d1c43d..8e0f53957e 100644
|
||||
--- a/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj
|
||||
+++ b/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj
|
||||
@@ -1,6 +1,6 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk.Razor">
|
||||
|
||||
- <Sdk Name="Yarn.MSBuild" />
|
||||
+ <Import Project="Sdk.props" Sdk="Yarn.MSBuild" Condition=" '$(DotNetBuildFromSource)' != 'true'" />
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
|
||||
@@ -25,6 +25,7 @@
|
||||
<PropertyGroup>
|
||||
<YarnWorkingDir>$(MSBuildThisFileDirectory)Interop\</YarnWorkingDir>
|
||||
<ResolveStaticWebAssetsInputsDependsOn>
|
||||
+ CheckForSourceBuild;
|
||||
CompileInterop;
|
||||
IncludeCompileInteropOutput;
|
||||
$(ResolveStaticWebAssetsInputsDependsOn)
|
||||
@@ -91,5 +92,11 @@
|
||||
<FileWrites Include="$(_InteropBuildOutput)" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
+
|
||||
+ <Target Name="CheckForSourceBuild" Condition=" '$(DotNetBuildFromSource)' == 'true'">
|
||||
+ <Error Text="The Yarn.Msbuild SDK is currently excluded from SourceBuild. If you are enabling this project for SourceBuild, remove the condition on the Yarn.Msbuild SDK above." />
|
||||
+ </Target>
|
||||
+
|
||||
+ <Import Project="Sdk.targets" Sdk="Yarn.MSBuild" Condition=" '$(DotNetBuildFromSource)' != 'true'" />
|
||||
|
||||
</Project>
|
||||
diff --git a/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj b/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj
|
||||
index 8d6a000d74..35c79a73eb 100644
|
||||
--- a/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj
|
||||
+++ b/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj
|
||||
@@ -1,6 +1,6 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk.Razor">
|
||||
|
||||
- <Sdk Name="Yarn.MSBuild" />
|
||||
+ <Import Project="Sdk.props" Sdk="Yarn.MSBuild" Condition=" '$(DotNetBuildFromSource)' != 'true'" />
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
|
||||
@@ -26,6 +26,7 @@
|
||||
<PropertyGroup>
|
||||
<YarnWorkingDir>$(MSBuildThisFileDirectory)Interop\</YarnWorkingDir>
|
||||
<ResolveStaticWebAssetsInputsDependsOn>
|
||||
+ CheckForSourceBuild;
|
||||
CompileInterop;
|
||||
IncludeCompileInteropOutput;
|
||||
$(ResolveStaticWebAssetsInputsDependsOn)
|
||||
@@ -93,4 +94,10 @@
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
+ <Target Name="CheckForSourceBuild" Condition=" '$(DotNetBuildFromSource)' == 'true'">
|
||||
+ <Error Text="The Yarn.Msbuild SDK is currently excluded from SourceBuild. If you are enabling this project for SourceBuild, remove the condition on the Yarn.Msbuild SDK above." />
|
||||
+ </Target>
|
||||
+
|
||||
+ <Import Project="Sdk.targets" Sdk="Yarn.MSBuild" Condition=" '$(DotNetBuildFromSource)' != 'true'" />
|
||||
+
|
||||
</Project>
|
||||
|
|
@ -84,22 +84,21 @@
|
|||
<CombinedFrameworkHostArchiveFileName Condition=" '$(PgoInstrument)' == 'true' ">dotnet-runtime$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</CombinedFrameworkHostArchiveFileName>
|
||||
<WinFormsAndWpfSharedFxArchiveFileName>windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</WinFormsAndWpfSharedFxArchiveFileName>
|
||||
|
||||
<AspNetCoreSharedFxInstallerRid Condition="'$(AspNetCoreSharedFxInstallerRid)' == ''">$(SharedFrameworkRid)</AspNetCoreSharedFxInstallerRid>
|
||||
<AspNetCoreSharedFxInstallerRid Condition="'$(SharedFrameworkRid)' == 'rhel.6-x64'">linux-x64</AspNetCoreSharedFxInstallerRid>
|
||||
<AspNetCoreSharedFxArchiveRid>$(AspNetCoreSharedFxInstallerRid)</AspNetCoreSharedFxArchiveRid>
|
||||
<AspNetCoreSharedFxInstallerRid Condition="('$(InstallerExtension)' == '.deb' OR '$(InstallerExtension)' == '.rpm') AND '$(Architecture)' != 'arm64'">x64</AspNetCoreSharedFxInstallerRid>
|
||||
<AspNetCoreSharedFxInstallerRid Condition="'$(InstallerExtension)' == '.rpm' AND '$(Architecture)' == 'arm64'">aarch64</AspNetCoreSharedFxInstallerRid>
|
||||
<AspNetCoreInstallerRid Condition="'$(AspNetCoreInstallerRid)' == ''">$(SharedFrameworkRid)</AspNetCoreInstallerRid>
|
||||
<AspNetCoreInstallerRid Condition="'$(SharedFrameworkRid)' == 'rhel.6-x64'">linux-x64</AspNetCoreInstallerRid>
|
||||
<AspNetCoreArchiveRid>$(AspNetCoreInstallerRid)</AspNetCoreArchiveRid>
|
||||
<AspNetCoreInstallerRid Condition="('$(InstallerExtension)' == '.deb' OR '$(InstallerExtension)' == '.rpm') AND '$(Architecture)' != 'arm64'">x64</AspNetCoreInstallerRid>
|
||||
<AspNetCoreInstallerRid Condition="'$(InstallerExtension)' == '.rpm' AND '$(Architecture)' == 'arm64'">aarch64</AspNetCoreInstallerRid>
|
||||
|
||||
<DownloadedAspNetCoreSharedFxInstallerFileName Condition=" '$(InstallerExtension)' != '' AND !$([MSBuild]::IsOSPlatform('OSX')) ">aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)</DownloadedAspNetCoreSharedFxInstallerFileName>
|
||||
<DownloadedAspNetCoreSharedFxInstallerFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcore-runtime-$(VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)</DownloadedAspNetCoreSharedFxInstallerFileName>
|
||||
<DownloadedAspNetCoreSharedFxInstallerFileName Condition=" '$(InstallerExtension)' != '' AND !$([MSBuild]::IsOSPlatform('OSX')) ">aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension)</DownloadedAspNetCoreSharedFxInstallerFileName>
|
||||
<DownloadedAspNetCoreSharedFxInstallerFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcore-runtime-$(VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension)</DownloadedAspNetCoreSharedFxInstallerFileName>
|
||||
<!-- Note: we use the "-internal" archives and installers that contain only the aspnetcore shared framework, and shouldn't overlap with Microsoft.NETCore.App. -->
|
||||
<DownloadedAspNetCoreSharedFxWixLibFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib</DownloadedAspNetCoreSharedFxWixLibFileName>
|
||||
<DownloadedAspNetTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
|
||||
<DownloadedAspNetTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' == '.rpm' ">aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
|
||||
<DownloadedAspNetTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefInternalPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
|
||||
<DownloadedAspNetCoreSharedFxWixLibFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreInstallerRid).wixlib</DownloadedAspNetCoreSharedFxWixLibFileName>
|
||||
<DownloadedAspNetTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
|
||||
<DownloadedAspNetTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefInternalPackageVersion)-$(AspNetCoreInstallerRid)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
|
||||
<DownloadedAspNetCoreV2ModuleInstallerFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcoremodule_$(Architecture)_en_v2_$(MicrosoftAspNetCoreAppRuntimePackageVersion)$(InstallerExtension)</DownloadedAspNetCoreV2ModuleInstallerFileName>
|
||||
<AspNetTargetingPackArchiveFileName>aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(ArchiveExtension)</AspNetTargetingPackArchiveFileName>
|
||||
<AspNetCoreSharedFxArchiveFileName>aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension)</AspNetCoreSharedFxArchiveFileName>
|
||||
<AspNetTargetingPackArchiveFileName>aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreArchiveRid)$(ArchiveExtension)</AspNetTargetingPackArchiveFileName>
|
||||
<AspNetCoreSharedFxArchiveFileName>aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreArchiveRid)$(ArchiveExtension)</AspNetCoreSharedFxArchiveFileName>
|
||||
|
||||
<!-- Used to detect if ASP.NET Core is built against the same version of Microsoft.NETCore.App. -->
|
||||
<AspNetCoreSharedFxBaseRuntimeVersionFileName>aspnetcore_base_runtime.version</AspNetCoreSharedFxBaseRuntimeVersionFileName>
|
||||
|
|
|
|||
Loading…
Reference in a new issue