Skip to content

Merge dotnet/templating into dotnet/sdk (Phase 2: build integration and ProjectReference conversion) #53680

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.

Sign up for GitHub

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
MichaelSimons merged 54 commits into from
Apr 17, 2026
Merged

Merge dotnet/templating into dotnet/sdk (Phase 2: build integration and ProjectReference conversion) #53680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
261609d
Add TemplateEngine package versions and signing configuration
MichaelSimons Mar 31, 2026
e163b62
Add TemplateEngine build infrastructure
MichaelSimons Mar 31, 2026
bbc8e93
Convert TemplateEngine PackageReferences to ProjectReferences
MichaelSimons Mar 31, 2026
00a591e
Add TemplateEngine projects to sdk.slnx
MichaelSimons Mar 31, 2026
8032d86
Fix TemplateEngine test infrastructure integration
MichaelSimons Mar 31, 2026
22677ce
Fix build issues from integration
MichaelSimons Mar 31, 2026
110aa49
Address review feedback
MichaelSimons Mar 31, 2026
654e9e0
Address additional review feedback
MichaelSimons Mar 31, 2026
11c0452
Address additional review feedback (round 3)
MichaelSimons Mar 31, 2026
dba64a1
Define TemplateEngineTestRoot property and update references
MichaelSimons Mar 31, 2026
16cf348
Use TemplateEngineTestRoot in SDK test project references
MichaelSimons Mar 31, 2026
cb36c78
Fix Helix test infrastructure for TemplateEngine
MichaelSimons Mar 31, 2026
f76ef22
Misc cleanup
MichaelSimons Apr 2, 2026
e9cc525
Add TemplateEngine projects to source-build solution filter
MichaelSimons Apr 2, 2026
06a92f8
Fix TemplateEngine test and build integration issues
MichaelSimons Apr 3, 2026
619e779
Update verified snapshots for STJ error message changes
MichaelSimons Apr 3, 2026
4d7495b
Deploy TemplateEngine test assets to separate Helix directory
MichaelSimons Apr 3, 2026
1db2406
Merge remote-tracking branch 'upstream/main' into merge-templating-ph…
MichaelSimons Apr 6, 2026
06d70f0
Remove XunitV3 variant projects now that xunit v3 migration is complete
MichaelSimons Apr 7, 2026
f601115
Migrate templating engine projects from xunit v2 to v3
MichaelSimons Apr 7, 2026
8e21738
Remove template engine version properties for packages now built from…
MichaelSimons Apr 7, 2026
c97492e
Suppress EOL target framework check for test template content
MichaelSimons Apr 7, 2026
2c43c01
Move TestTemplates to TestAssets/TestPackages/TemplateEngine
MichaelSimons Apr 7, 2026
d45dc50
Merge upstream/main (includes TestTemplates move to TestAssets)
MichaelSimons Apr 7, 2026
34696f1
Rename TemplateEngine MSBuild properties for brevity
MichaelSimons Apr 8, 2026
8143581
Misc cleanup
MichaelSimons Apr 8, 2026
9c08d86
Update Signing.props
MichaelSimons Apr 8, 2026
ab0bc1d
Resolve package diffs
MichaelSimons Apr 8, 2026
1ad5816
Update src/TemplateEngine/Directory.Build.targets
MichaelSimons Apr 8, 2026
adca7af
Update src/TemplateEngine/Tools/Microsoft.TemplateEngine.Authoring.Ta…
MichaelSimons Apr 8, 2026
8ff6e5b
Update GetCodeBaseRoot
MichaelSimons Apr 13, 2026
9ed54b6
Merge remote-tracking branch 'upstream/main' into merge-templating-ph…
MichaelSimons Apr 13, 2026
3981dc7
Pin NuGet packages to netstandard2.0-compatible version for TemplateE…
MichaelSimons Apr 13, 2026
02aae71
Migrate TemplateEngine TestBase to use SdkTestContext for Helix compa…
MichaelSimons Apr 13, 2026
f55f0aa
Add TemplateEngine sample templates to Helix payload and make TestBas…
MichaelSimons Apr 13, 2026
9686a77
Update DefaultTemplatePackageProviderTests to use SdkTestContext
MichaelSimons Apr 14, 2026
e5f271a
Fix TemplateEngine test failures in Helix
Apr 14, 2026
e614861
Fix remaining TemplateEngine Helix test failures
Apr 14, 2026
9a8692e
Add SnapshotsDirectory to InstallsToCustomLocation test
Apr 14, 2026
bf38d9e
Add TemplateSearch.TemplateDiscovery to test packages
Apr 14, 2026
50d0dda
Skip VerifyCommand tests that fail with Verify.XunitV3 outside xUnit …
Apr 15, 2026
887818c
Consolidate snapshot directory paths into TestBase constants
Apr 15, 2026
dc482f1
Use TestBase.TestTemplatesLocation in ExportCommandTests
Apr 15, 2026
e01a5df
Clean up test infrastructure: consolidate paths, reduce Using removes
Apr 15, 2026
3ffe9de
Add arm64 verified snapshots for ExampleTemplateTest
Apr 15, 2026
49f6eb8
Fix TemplateDiscoveryTool version resolution
Apr 15, 2026
ef417aa
Add comment explaining NuGet VersionOverride for netstandard compatib…
MichaelSimons Apr 16, 2026
3f9cd62
Merge branch 'main' into merge-templating-phase2
MichaelSimons Apr 16, 2026
a2de6f2
Update Directory.Build.props
MichaelSimons Apr 16, 2026
90435c0
Remove unnecessary GenerateProgramFile override for TemplateEngine tests
MichaelSimons Apr 16, 2026
6d1b0ed
Remove duplicate Content include for Approvals files
MichaelSimons Apr 16, 2026
c46f0d9
Merge branch 'merge-templating-phase2' of https://github.com/MichaelS…
MichaelSimons Apr 16, 2026
080feaf
Merge branch 'main' into merge-templating-phase2
MichaelSimons Apr 16, 2026
8652c2a
Use TestBase.SnapshotsDirectory instead of inline path construction
MichaelSimons Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@

<PropertyGroup>
<SdkSrcRoot>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src'))</SdkSrcRoot>
<TemplateEngSrcDir>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src', 'TemplateEngine'))</TemplateEngSrcDir>
<TemplateEngTestDir>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'test', 'TemplateEngine'))</TemplateEngTestDir>
<TemplateEngTestAssetsDir>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'test', 'TestAssets', 'TestPackages', 'TemplateEngine'))</TemplateEngTestAssetsDir>
<TestHostFolder>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'redist', '$(Configuration)'))</TestHostFolder>
<TestHostDotNetRoot>$([MSBuild]::NormalizeDirectory('$(TestHostFolder)', 'dotnet'))</TestHostDotNetRoot>
<TestHostDotNetTool>$(TestHostDotNetRoot)$([System.IO.Path]::GetFileName('$(DotNetTool)'))</TestHostDotNetTool>
Expand Down
11 changes: 4 additions & 7 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<PackageVersion Include="Basic.CompilerLog.Util" Version="0.9.18" />
<PackageVersion Include="BenchmarkDotNet" Version="$(BenchmarkDotNetPackageVersion)" />
<PackageVersion Include="BenchmarkDotNet.Diagnostics.Windows" Version="$(BenchmarkDotNetDiagnosticsWindowsPackageVersion)" />
<PackageVersion Include="JsonSchema.Net" Version="7.3.2" />
<PackageVersion Include="MessagePack" Version="3.1.4" />
<PackageVersion Include="MicroBuild.Plugins.SwixBuild.Dotnet" Version="1.1.87-gba258badda" />
<PackageVersion Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="$(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion)" />
Expand Down Expand Up @@ -68,6 +69,7 @@
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)" />
<PackageVersion Include="Microsoft.FSharp.Compiler" Version="$(MicrosoftFSharpCompilerPackageVersion)" />
<PackageVersion Include="Microsoft.IO.Redist" Version="6.1.0" />
<PackageVersion Include="Microsoft.Net.Compilers.Toolset.Framework" Version="$(MicrosoftNetCompilersToolsetFrameworkPackageVersion)" />
<PackageVersion Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
<PackageVersion Include="Microsoft.NET.HostModel" Version="$(MicrosoftNETHostModelVersion)" />
Expand All @@ -79,12 +81,6 @@
<PackageVersion Include="Microsoft.NETCore.Targets" Version="2.1.0" />
<!-- The MicrosoftSignedWixVersion property comes from the Arcade SDK DefaultVersions.props -->
<PackageVersion Include="Microsoft.Signed.Wix" Version="$(MicrosoftSignedWixVersion)" />
<PackageVersion Include="Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3" Version="$(MicrosoftTemplateEngineAuthoringTemplateVerifierXunitV3PackageVersion)" />
<PackageVersion Include="Microsoft.TemplateEngine.Edge" Version="$(MicrosoftTemplateEngineEdgePackageVersion)" />
<PackageVersion Include="Microsoft.TemplateEngine.Mocks.XunitV3" Version="$(MicrosoftTemplateEngineMocksXunitV3PackageVersion)" />
<PackageVersion Include="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" Version="$(MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion)" />
<PackageVersion Include="Microsoft.TemplateEngine.TestHelper.XunitV3" Version="$(MicrosoftTemplateEngineTestHelperXunitV3PackageVersion)" />
<PackageVersion Include="Microsoft.TemplateSearch.Common" Version="$(MicrosoftTemplateSearchCommonPackageVersion)" />
<PackageVersion Include="Microsoft.TestPlatform.Build" Version="$(MicrosoftTestPlatformBuildPackageVersion)" />
<PackageVersion Include="Microsoft.TestPlatform.CLI" Version="$(MicrosoftTestPlatformCLIPackageVersion)" />
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.4.16" />
Expand All @@ -110,6 +106,7 @@
<PackageVersion Include="NuGet.Commands" Version="$(NuGetCommandsPackageVersion)" />
<PackageVersion Include="NuGet.Common" Version="$(NuGetCommonPackageVersion)" />
<PackageVersion Include="NuGet.Configuration" Version="$(NuGetConfigurationPackageVersion)" />
<PackageVersion Include="NuGet.Credentials" Version="$(NuGetBuildTasksPackageVersion)" />
<PackageVersion Include="NuGet.Frameworks" Version="$(NuGetBuildTasksPackageVersion)" />
<PackageVersion Include="NuGet.LibraryModel" Version="$(NuGetProjectModelPackageVersion)" />
<PackageVersion Include="NuGet.Localization" Version="$(NuGetLocalizationPackageVersion)" />
Expand All @@ -122,7 +119,7 @@
<PackageVersion Include="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
<PackageVersion Include="Spectre.Console" Version="0.54.0" />
<PackageVersion Include="Spectre.Console.Testing" Version="0.54.0" />
<PackageVersion Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzersPackageVersion)" />
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
<PackageVersion Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
<PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
<PackageVersion Include="System.CommandLine.NamingConventionBinder" Version="$(SystemCommandLineNamingConventionBinderVersion)" />
Expand Down
42 changes: 38 additions & 4 deletions TemplateEngine.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"solution": {
"path": "sdk.slnx",
"projects": [
"test\\TestAssets\\TestPackages\\dotnet-new\\Microsoft.TemplateEngine.TestTemplates.csproj",
"src\\Cli\\Microsoft.DotNet.Cli.Sln.Internal\\Microsoft.DotNet.Cli.Sln.Internal.csproj",
"src\\Cli\\Microsoft.DotNet.Cli.Utils\\Microsoft.DotNet.Cli.Utils.csproj",
"src\\Cli\\Microsoft.DotNet.Configurer\\Microsoft.DotNet.Configurer.csproj",
Expand All @@ -13,12 +12,47 @@
"src\\Microsoft.Win32.Msi\\Microsoft.Win32.Msi.csproj",
"src\\Resolvers\\Microsoft.DotNet.NativeWrapper\\Microsoft.DotNet.NativeWrapper.csproj",
"src\\Resolvers\\Microsoft.DotNet.SdkResolver\\Microsoft.DotNet.SdkResolver.csproj",
"src\\TemplateEngine\\Microsoft.TemplateEngine.Abstractions\\Microsoft.TemplateEngine.Abstractions.csproj",
"src\\TemplateEngine\\Microsoft.TemplateEngine.Core.Contracts\\Microsoft.TemplateEngine.Core.Contracts.csproj",
"src\\TemplateEngine\\Microsoft.TemplateEngine.Core\\Microsoft.TemplateEngine.Core.csproj",
"src\\TemplateEngine\\Microsoft.TemplateEngine.Edge\\Microsoft.TemplateEngine.Edge.csproj",
"src\\TemplateEngine\\Microsoft.TemplateEngine.IDE\\Microsoft.TemplateEngine.IDE.csproj",
"src\\TemplateEngine\\Microsoft.TemplateEngine.Orchestrator.RunnableProjects\\Microsoft.TemplateEngine.Orchestrator.RunnableProjects.csproj",
"src\\TemplateEngine\\Microsoft.TemplateEngine.Utils\\Microsoft.TemplateEngine.Utils.csproj",
"src\\TemplateEngine\\Microsoft.TemplateSearch.Common\\Microsoft.TemplateSearch.Common.csproj",
"src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.CLI\\Microsoft.TemplateEngine.Authoring.CLI.csproj",
"src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.Tasks\\Microsoft.TemplateEngine.Authoring.Tasks.csproj",
"src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier\\Microsoft.TemplateEngine.Authoring.TemplateApiVerifier.csproj",
"src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.Authoring.TemplateVerifier\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.csproj",
"src\\TemplateEngine\\Tools\\Microsoft.TemplateEngine.TemplateLocalizer.Core\\Microsoft.TemplateEngine.TemplateLocalizer.Core.csproj",
"src\\TemplateEngine\\Tools\\Microsoft.TemplateSearch.TemplateDiscovery\\Microsoft.TemplateSearch.TemplateDiscovery.csproj",
"template_feed\\Microsoft.DotNet.Common.ItemTemplates\\Microsoft.DotNet.Common.ItemTemplates.csproj",
"template_feed\\Microsoft.DotNet.Common.ProjectTemplates.11.0\\Microsoft.DotNet.Common.ProjectTemplates.11.0.csproj",
"template_feed\\Microsoft.TemplateEngine.Authoring.Templates\\Microsoft.TemplateEngine.Authoring.Templates.csproj",
"documentation\\TemplateEngine\\Samples\\Microsoft.TemplateEngine.Samples.csproj",
"test\\Microsoft.DotNet.TemplateLocator.Tests\\Microsoft.DotNet.TemplateLocator.Tests.csproj",
"test\\Microsoft.NET.TestFramework\\Microsoft.NET.TestFramework.csproj",
"test\\Microsoft.TemplateEngine.Cli.UnitTests\\Microsoft.TemplateEngine.Cli.UnitTests.csproj",
"test\\TemplateEngine\\Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests\\Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests.csproj",
"test\\TemplateEngine\\Microsoft.TemplateEngine.Authoring.CLI.UnitTests\\Microsoft.TemplateEngine.Authoring.CLI.UnitTests.csproj",
"test\\TemplateEngine\\Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests\\Microsoft.TemplateEngine.Authoring.Tasks.IntegrationTests.csproj",
"test\\TemplateEngine\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.IntegrationTests.csproj",
"test\\TemplateEngine\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests\\Microsoft.TemplateEngine.Authoring.TemplateVerifier.UnitTests.csproj",
"test\\TemplateEngine\\Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests\\Microsoft.TemplateEngine.Authoring.Templates.IntegrationTests.csproj",
"test\\TemplateEngine\\Microsoft.TemplateEngine.Core.UnitTests\\Microsoft.TemplateEngine.Core.UnitTests.csproj",
"test\\TemplateEngine\\Microsoft.TemplateEngine.Edge.UnitTests\\Microsoft.TemplateEngine.Edge.UnitTests.csproj",
"test\\TemplateEngine\\Microsoft.TemplateEngine.IDE.IntegrationTests\\Microsoft.TemplateEngine.IDE.IntegrationTests.csproj",
"test\\TemplateEngine\\Microsoft.TemplateEngine.Mocks\\Microsoft.TemplateEngine.Mocks.csproj",
"test\\TemplateEngine\\Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests\\Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests.csproj",
"test\\TemplateEngine\\Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests\\Microsoft.TemplateEngine.TemplateLocalizer.Core.UnitTests.csproj",
"test\\TemplateEngine\\Microsoft.TemplateEngine.TestHelper\\Microsoft.TemplateEngine.TestHelper.csproj",
"test\\TemplateEngine\\Microsoft.TemplateEngine.Utils.UnitTests\\Microsoft.TemplateEngine.Utils.UnitTests.csproj",
"test\\TemplateEngine\\Microsoft.TemplateSearch.Common.UnitTests\\Microsoft.TemplateSearch.Common.UnitTests.csproj",
"test\\TemplateEngine\\Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests\\Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests.csproj",
"test\\TestAssets\\TestPackages\\dotnet-new\\Microsoft.TemplateEngine.TestTemplates.csproj",
"test\\TestAssets\\TestPackages\\TemplateEngine\\Microsoft.TemplateEngine.TestTemplates.csproj",
"test\\dotnet-new.IntegrationTests\\dotnet-new.IntegrationTests.csproj",
"test\\dotnet.Tests\\dotnet.Tests.csproj",
"template_feed\\Microsoft.DotNet.Common.ItemTemplates\\Microsoft.DotNet.Common.ItemTemplates.csproj",
"template_feed\\Microsoft.DotNet.Common.ProjectTemplates.11.0\\Microsoft.DotNet.Common.ProjectTemplates.11.0.csproj"
"test\\dotnet.Tests\\dotnet.Tests.csproj"
]
}
}
1 change: 1 addition & 0 deletions build/SetupHelixEnvironment.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ set DOTNET_SDK_TEST_EXECUTION_DIRECTORY=%TestExecutionDirectory%
set DOTNET_SDK_TEST_MSBUILDSDKRESOLVER_FOLDER=%HELIX_CORRELATION_PAYLOAD%\r
set DOTNET_SDK_TEST_ASSETS_DIRECTORY=%TestExecutionDirectory%\TestAssets
set DOTNET_SDK_TEST_REPO_TEMPLATE_PACKAGES=%TestExecutionDirectory%\template_feed
set DOTNET_SDK_TEST_TEMPLATE_SAMPLES_DIR=%TestExecutionDirectory%\TemplateSamples

REM call dotnet new so the first run message doesn't interfere with the first test
dotnet new --debug:ephemeral-hive
Expand Down
1 change: 1 addition & 0 deletions build/SetupHelixEnvironment.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export DOTNET_SDK_TEST_EXECUTION_DIRECTORY=$TestExecutionDirectory
export DOTNET_SDK_TEST_MSBUILDSDKRESOLVER_FOLDER=$HELIX_CORRELATION_PAYLOAD/r
export DOTNET_SDK_TEST_ASSETS_DIRECTORY=$TestExecutionDirectory/TestAssets
export DOTNET_SDK_TEST_REPO_TEMPLATE_PACKAGES=$TestExecutionDirectory/template_feed
export DOTNET_SDK_TEST_TEMPLATE_SAMPLES_DIR=$TestExecutionDirectory/TemplateSamples

# call dotnet new so the first run message doesn't interfere with the first test
dotnet new --debug:ephemeral-hive
Expand Down
2 changes: 1 addition & 1 deletion documentation/TemplateEngine/Samples/Microsoft.TemplateEngine.Samples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<Authors>Microsoft</Authors>
<Description>Common Project File for Dotnet Template Samples</Description>
<language>en-US</language>
<PackageProjectUrl>https://github.com/dotnet/templating</PackageProjectUrl>
<PackageProjectUrl>https://github.com/dotnet/sdk</PackageProjectUrl>
<PackageType>Template</PackageType>
<SuppressDependenciesWhenPacking>True</SuppressDependenciesWhenPacking>
</PropertyGroup>
Expand Down
3 changes: 3 additions & 0 deletions eng/Signing.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
<FileSignInfo Include="SimpleInfoName.dll" CertificateName="$(ExternalCertificateId)" />
<FileSignInfo Include="Verify.dll" CertificateName="$(ExternalCertificateId)" />
<FileSignInfo Include="Verify.DiffPlex.dll" CertificateName="$(ExternalCertificateId)" />
<FileSignInfo Include="Verify.Xunitv3.dll" CertificateName="$(ExternalCertificateId)" />
</ItemGroup>

<ItemGroup>
Expand All @@ -107,6 +108,8 @@
<!-- Filter out any test packages from ItemsToSign -->
<ItemGroup>
<ItemsToSign Remove="$(ArtifactsPackagesDir)**\*tests*.nupkg" />
<ItemsToSign Remove="$(ArtifactsPackagesDir)**\Microsoft.TemplateEngine.Mocks.*.nupkg" />
<ItemsToSign Remove="$(ArtifactsPackagesDir)**\Microsoft.TemplateEngine.TestHelper.*.nupkg" />
</ItemGroup>

<ItemGroup Condition="'$(EnableDefaultArtifacts)' != 'true'">
Expand Down
18 changes: 0 additions & 18 deletions eng/Version.Details.props
View file
Open in desktop
Comment thread
MichaelSimons marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,6 @@ This file should be imported by eng/Versions.props
<MicrosoftSourceLinkCommonPackageVersion>11.0.100-preview.4.26208.110</MicrosoftSourceLinkCommonPackageVersion>
<MicrosoftSourceLinkGitHubPackageVersion>11.0.100-preview.4.26208.110</MicrosoftSourceLinkGitHubPackageVersion>
<MicrosoftSourceLinkGitLabPackageVersion>11.0.100-preview.4.26208.110</MicrosoftSourceLinkGitLabPackageVersion>
<MicrosoftTemplateEngineAbstractionsPackageVersion>11.0.100-preview.4.26208.110</MicrosoftTemplateEngineAbstractionsPackageVersion>
<MicrosoftTemplateEngineAuthoringTemplateVerifierXunitV3PackageVersion>11.0.100-preview.4.26208.110</MicrosoftTemplateEngineAuthoringTemplateVerifierXunitV3PackageVersion>
<MicrosoftTemplateEngineEdgePackageVersion>11.0.100-preview.4.26208.110</MicrosoftTemplateEngineEdgePackageVersion>
<MicrosoftTemplateEngineMocksXunitV3PackageVersion>11.0.100-preview.4.26208.110</MicrosoftTemplateEngineMocksXunitV3PackageVersion>
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>11.0.100-preview.4.26208.110</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
<MicrosoftTemplateEngineTestHelperXunitV3PackageVersion>11.0.100-preview.4.26208.110</MicrosoftTemplateEngineTestHelperXunitV3PackageVersion>
<MicrosoftTemplateEngineUtilsPackageVersion>11.0.100-preview.4.26208.110</MicrosoftTemplateEngineUtilsPackageVersion>
<MicrosoftTemplateSearchCommonPackageVersion>11.0.100-preview.4.26208.110</MicrosoftTemplateSearchCommonPackageVersion>
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>11.0.100-preview.4.26208.110</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
<MicrosoftTestPlatformBuildPackageVersion>18.7.0-preview-26208-110</MicrosoftTestPlatformBuildPackageVersion>
<MicrosoftTestPlatformCLIPackageVersion>18.7.0-preview-26208-110</MicrosoftTestPlatformCLIPackageVersion>
<MicrosoftWebXdtPackageVersion>3.3.0-preview.4.26208.110</MicrosoftWebXdtPackageVersion>
Expand Down Expand Up @@ -234,15 +225,6 @@ This file should be imported by eng/Versions.props
<MicrosoftSourceLinkCommonVersion>$(MicrosoftSourceLinkCommonPackageVersion)</MicrosoftSourceLinkCommonVersion>
<MicrosoftSourceLinkGitHubVersion>$(MicrosoftSourceLinkGitHubPackageVersion)</MicrosoftSourceLinkGitHubVersion>
<MicrosoftSourceLinkGitLabVersion>$(MicrosoftSourceLinkGitLabPackageVersion)</MicrosoftSourceLinkGitLabVersion>
<MicrosoftTemplateEngineAbstractionsVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAbstractionsVersion>
<MicrosoftTemplateEngineAuthoringTemplateVerifierXunitV3Version>$(MicrosoftTemplateEngineAuthoringTemplateVerifierXunitV3PackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierXunitV3Version>
<MicrosoftTemplateEngineEdgeVersion>$(MicrosoftTemplateEngineEdgePackageVersion)</MicrosoftTemplateEngineEdgeVersion>
<MicrosoftTemplateEngineMocksXunitV3Version>$(MicrosoftTemplateEngineMocksXunitV3PackageVersion)</MicrosoftTemplateEngineMocksXunitV3Version>
<MicrosoftTemplateEngineOrchestratorRunnableProjectsVersion>$(MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsVersion>
<MicrosoftTemplateEngineTestHelperXunitV3Version>$(MicrosoftTemplateEngineTestHelperXunitV3PackageVersion)</MicrosoftTemplateEngineTestHelperXunitV3Version>
<MicrosoftTemplateEngineUtilsVersion>$(MicrosoftTemplateEngineUtilsPackageVersion)</MicrosoftTemplateEngineUtilsVersion>
<MicrosoftTemplateSearchCommonVersion>$(MicrosoftTemplateSearchCommonPackageVersion)</MicrosoftTemplateSearchCommonVersion>
<MicrosoftTemplateSearchTemplateDiscoveryVersion>$(MicrosoftTemplateSearchTemplateDiscoveryPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryVersion>
<MicrosoftTestPlatformBuildVersion>$(MicrosoftTestPlatformBuildPackageVersion)</MicrosoftTestPlatformBuildVersion>
<MicrosoftTestPlatformCLIVersion>$(MicrosoftTestPlatformCLIPackageVersion)</MicrosoftTestPlatformCLIVersion>
<MicrosoftWebXdtVersion>$(MicrosoftWebXdtPackageVersion)</MicrosoftWebXdtVersion>
Expand Down
36 changes: 0 additions & 36 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,6 @@
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="sdk" Sha="0cf6b19ed68d2d52e097e6af6d6046b4eeefefe2" BarId="309569" />
<ProductDependencies>
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="11.0.100-preview.4.26208.110">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0cf6b19ed68d2d52e097e6af6d6046b4eeefefe2</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Edge" Version="11.0.100-preview.4.26208.110">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0cf6b19ed68d2d52e097e6af6d6046b4eeefefe2</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" Version="11.0.100-preview.4.26208.110">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0cf6b19ed68d2d52e097e6af6d6046b4eeefefe2</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Utils" Version="11.0.100-preview.4.26208.110">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0cf6b19ed68d2d52e097e6af6d6046b4eeefefe2</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateSearch.Common" Version="11.0.100-preview.4.26208.110">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0cf6b19ed68d2d52e097e6af6d6046b4eeefefe2</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Mocks.XunitV3" Version="11.0.100-preview.4.26208.110">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0cf6b19ed68d2d52e097e6af6d6046b4eeefefe2</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.TestHelper.XunitV3" Version="11.0.100-preview.4.26208.110">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0cf6b19ed68d2d52e097e6af6d6046b4eeefefe2</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.TemplateVerifier.XunitV3" Version="11.0.100-preview.4.26208.110">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0cf6b19ed68d2d52e097e6af6d6046b4eeefefe2</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateSearch.TemplateDiscovery" Version="11.0.100-preview.4.26208.110">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0cf6b19ed68d2d52e097e6af6d6046b4eeefefe2</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.4.26208.110">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0cf6b19ed68d2d52e097e6af6d6046b4eeefefe2</Sha>
Expand Down
Loading
Loading