mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'release/7.0.3xx' into merge/release/7.0.1xx-to-release/7.0.3xx

Browse source
This commit is contained in:
Forgind 2023-10-04 14:09:18 -07:00 committed by GitHub
commit b97ea40f83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 206 additions and 172 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.vsts-ci.yml
View file

@ -334,10 +334,11 @@ stages:
- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml
- ${{ if in(variables['Build.Reason'], 'PullRequest') }}: # For .NET 7.0, source-build currently supports 7.0.1xx. Disable tarball build validation in all other branches.
- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
parameters: # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
dependsOn: Source_Build_Create_Tarball # parameters:
# dependsOn: Source_Build_Create_Tarball
# https://github.com/dotnet/core-sdk/issues/248 # https://github.com/dotnet/core-sdk/issues/248
# - template: /eng/build.yml # - template: /eng/build.yml

15
NuGet.config
View file

@ -6,23 +6,18 @@
<packageSources> <packageSources>
<clear /> <clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<add key="darc-pub-DotNet-msbuild-Trusted-2679cf5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-2679cf5a/nuget/v3/index.json" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-70048be" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-70048bee/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore --> <!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk --> <!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-79b01e4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-79b01e47/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk --> <!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<add key="darc-pub-DotNet-msbuild-Trusted-6918b86" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-6918b863/nuget/v3/index.json" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-ecb34f8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-ecb34f85/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime --> <!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-d0b45a0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-d0b45a00/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-sdk --> <!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop --> <!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-b193aa2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-b193aa2e/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-windowsdesktop --> <!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <!--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" /> <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@ -44,15 +39,11 @@
<disabledPackageSources> <disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore --> <!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-70048be" value="true" />
<!-- End: Package sources from dotnet-aspnetcore --> <!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-ecb34f8" value="true" />
<!-- Begin: Package sources from dotnet-sdk --> <!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-d0b45a0" value="true" />
<!-- End: Package sources from dotnet-sdk --> <!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop --> <!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-b193aa2" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop --> <!-- End: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-runtime --> <!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

80
eng/Version.Details.xml
View file

@ -85,35 +85,35 @@
<Uri>https://github.com/dotnet/test-templates</Uri> <Uri>https://github.com/dotnet/test-templates</Uri>
<Sha>0385265f4d0b6413d64aea0223172366a9b9858c</Sha> <Sha>0385265f4d0b6413d64aea0223172366a9b9858c</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.5.0" Version="1.0.2-beta4.22503.2"> <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.5.0" Version="1.1.0-rc.23213.1">
<Uri>https://github.com/dotnet/test-templates</Uri> <Uri>https://github.com/dotnet/test-templates</Uri>
<Sha>aaaa0c1826f97a9dfcc67e94136bf01010b55f23</Sha> <Sha>45a41b353d078e4d1e5918246fddbacb452eb210</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.6.0" Version="1.0.2-beta4.22503.2"> <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.6.0" Version="1.1.0-rc.23213.1">
<Uri>https://github.com/dotnet/test-templates</Uri> <Uri>https://github.com/dotnet/test-templates</Uri>
<Sha>aaaa0c1826f97a9dfcc67e94136bf01010b55f23</Sha> <Sha>45a41b353d078e4d1e5918246fddbacb452eb210</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.7.0" Version="1.0.2-beta4.22503.2"> <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.7.0" Version="1.1.0-rc.23213.1">
<Uri>https://github.com/dotnet/test-templates</Uri> <Uri>https://github.com/dotnet/test-templates</Uri>
<Sha>aaaa0c1826f97a9dfcc67e94136bf01010b55f23</Sha> <Sha>45a41b353d078e4d1e5918246fddbacb452eb210</Sha>
<SourceBuild RepoName="test-templates" ManagedOnly="true" /> <SourceBuild RepoName="test-templates" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.111"> <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.308">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>d0b45a002cc72d1932d7c1a6a87482bac3518c5d</Sha> <Sha>3df19b5c2397628b241f0785320858fa0ab1d9aa</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.111-servicing.23425.44"> <Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.308-servicing.23425.45">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>d0b45a002cc72d1932d7c1a6a87482bac3518c5d</Sha> <Sha>3df19b5c2397628b241f0785320858fa0ab1d9aa</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.111-servicing.23425.44"> <Dependency Name="Microsoft.NET.Sdk" Version="7.0.308-servicing.23425.45">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>d0b45a002cc72d1932d7c1a6a87482bac3518c5d</Sha> <Sha>3df19b5c2397628b241f0785320858fa0ab1d9aa</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" /> <SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.111-servicing.23425.44"> <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.308-servicing.23425.45">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>d0b45a002cc72d1932d7c1a6a87482bac3518c5d</Sha> <Sha>3df19b5c2397628b241f0785320858fa0ab1d9aa</Sha>
</Dependency> </Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop --> <!-- 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="7.0.11-servicing.23425.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64"> <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.11-servicing.23425.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@ -124,39 +124,43 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>6432861c5a360348a9e1a6cc76cced7bd25ab3f9</Sha> <Sha>6432861c5a360348a9e1a6cc76cced7bd25ab3f9</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.4.0-beta.22571.5" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.FSharp.Compiler" Version="12.5.0-beta.23203.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri> <Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>1d892dd78d5dcb261a1d26f72efb333834436a02</Sha> <Sha>5b37dd5fea143baefbef2bd83836188af0815a30</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="7.0.0-beta.22571.5" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="7.0.300-beta.23203.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri> <Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>1d892dd78d5dcb261a1d26f72efb333834436a02</Sha> <Sha>5b37dd5fea143baefbef2bd83836188af0815a30</Sha>
<SourceBuild RepoName="fsharp" ManagedOnly="true" /> <SourceBuild RepoName="fsharp" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.4.1-release-20230405-06" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.6.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/microsoft/vstest</Uri> <Uri>https://github.com/microsoft/vstest</Uri>
<Sha>79d56b02b69a582cd90428878a5e9411ab7538f5</Sha> <Sha>e7ea853f64af5a4c240acaf9e54cdae3ae0eb7bb</Sha>
<SourceBuild RepoName="vstest" ManagedOnly="true" /> <SourceBuild RepoName="vstest" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.23062.2" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.23401.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/linker</Uri> <Uri>https://github.com/dotnet/linker</Uri>
<Sha>19fa656d35252ccf926e6a6d783b16a2f094aaef</Sha> <Sha>53b3303c57b3fe659500fb362a0eef12991c1197</Sha>
<SourceBuild RepoName="linker" ManagedOnly="true" /> <SourceBuild RepoName="linker" ManagedOnly="true" />
<RepoName>linker</RepoName> <RepoName>linker</RepoName>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.4.0-6.23101.13" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.6.0-3.23329.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn</Uri> <Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>528676cdbf0bfcfdb9372dc57a047dd0edc6d4db</Sha> <Sha>5db000294db8cc634e7d8fc004844338c9747dbc</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" /> <SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.Build" Version="17.4.8" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.Build" Version="17.6.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri> <Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>6918b863aa37ad0699f98482fbab9f7a52e65a92</Sha> <Sha>2679cf5a9cbd13e6833ca8a59553716f3f2f2afa</Sha>
<SourceBuildTarball RepoName="msbuild" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.4.2-rc.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.6.10-preview-23329-03" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>2679cf5a9cbd13e6833ca8a59553716f3f2f2afa</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.6.0-rc.66" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted</Uri> <Uri>https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted</Uri>
<Sha>24f8150c97f9d26a7b5d77e983938e18d48e7d9f</Sha> <Sha>a36edf3a2bf891d6aabfc83cc0b21d24a870ea1a</Sha>
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" /> <SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0"> <Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
@ -186,26 +190,20 @@
<Sha>7b9791daa3a3477eb22ec805946c9fff8b42d8ca</Sha> <Sha>7b9791daa3a3477eb22ec805946c9fff8b42d8ca</Sha>
<SourceBuild RepoName="symreader" ManagedOnly="true" /> <SourceBuild RepoName="symreader" ManagedOnly="true" />
</Dependency> </Dependency>
<!-- temporary workaround for the wrong version of dotnet-format flowing into dotnet/sdk -->
<Dependency Name="dotnet-format" Version="7.0.352001">
<Uri>https://github.com/dotnet/format</Uri>
<Sha>6a22157622e5da71ba0c43d23269352210bdb277</Sha>
<SourceBuildTarball RepoName="format" ManagedOnly="true" />
</Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23408.3"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23478.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3b8f3de4606c338f99e8ce85cfb6f960f6a428c8</Sha> <Sha>6d7ba5913e94d6f3988f5c66fc57eb00e28b8561</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" /> <SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.23408.3"> <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.23478.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3b8f3de4606c338f99e8ce85cfb6f960f6a428c8</Sha> <Sha>6d7ba5913e94d6f3988f5c66fc57eb00e28b8561</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23408.3"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23478.1">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3b8f3de4606c338f99e8ce85cfb6f960f6a428c8</Sha> <Sha>6d7ba5913e94d6f3988f5c66fc57eb00e28b8561</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.23219.1"> <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.23219.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri> <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

27
eng/Versions.props
View file

@ -7,8 +7,8 @@
<PropertyGroup> <PropertyGroup>
<VersionMajor>7</VersionMajor> <VersionMajor>7</VersionMajor>
<VersionMinor>0</VersionMinor> <VersionMinor>0</VersionMinor>
<VersionSDKMinor>1</VersionSDKMinor> <VersionSDKMinor>3</VersionSDKMinor>
<VersionFeature>13</VersionFeature> <VersionFeature>10</VersionFeature>
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix> <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel> <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<PreReleaseVersionIteration> <PreReleaseVersionIteration>
@ -23,7 +23,7 @@
<VersionFeature21>30</VersionFeature21> <VersionFeature21>30</VersionFeature21>
<VersionFeature31>32</VersionFeature31> <VersionFeature31>32</VersionFeature31>
<VersionFeature50>17</VersionFeature50> <VersionFeature50>17</VersionFeature50>
<VersionFeature60>$([MSBuild]::Add($(VersionFeature), 11))</VersionFeature60> <VersionFeature60>$([MSBuild]::Add($(VersionFeature), 14))</VersionFeature60>
</PropertyGroup> </PropertyGroup>
<!-- Restore feeds --> <!-- Restore feeds -->
<PropertyGroup Label="Restore feeds"> <PropertyGroup Label="Restore feeds">
@ -33,7 +33,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade --> <!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.23408.3</MicrosoftDotNetBuildTasksInstallersPackageVersion> <MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.23478.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms --> <!-- Dependency from https://github.com/dotnet/winforms -->
@ -46,9 +46,9 @@
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/test-templates --> <!-- Dependency from https://github.com/dotnet/test-templates -->
<MicrosoftDotNetTestProjectTemplates30PackageVersion>1.0.2-beta4.22406.1</MicrosoftDotNetTestProjectTemplates30PackageVersion> <MicrosoftDotNetTestProjectTemplates30PackageVersion>1.0.2-beta4.22406.1</MicrosoftDotNetTestProjectTemplates30PackageVersion>
<MicrosoftDotNetTestProjectTemplates50PackageVersion>1.0.2-beta4.22503.2</MicrosoftDotNetTestProjectTemplates50PackageVersion> <MicrosoftDotNetTestProjectTemplates50PackageVersion>1.1.0-rc.23213.1</MicrosoftDotNetTestProjectTemplates50PackageVersion>
<MicrosoftDotNetTestProjectTemplates60PackageVersion>1.0.2-beta4.22503.2</MicrosoftDotNetTestProjectTemplates60PackageVersion> <MicrosoftDotNetTestProjectTemplates60PackageVersion>1.1.0-rc.23213.1</MicrosoftDotNetTestProjectTemplates60PackageVersion>
<MicrosoftDotNetTestProjectTemplates70PackageVersion>1.0.2-beta4.22503.2</MicrosoftDotNetTestProjectTemplates70PackageVersion> <MicrosoftDotNetTestProjectTemplates70PackageVersion>1.1.0-rc.23213.1</MicrosoftDotNetTestProjectTemplates70PackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- NUnit3.DotNetNew.Template versions do not 'flow in' --> <!-- NUnit3.DotNetNew.Template versions do not 'flow in' -->
@ -69,13 +69,17 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk --> <!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.111</MicrosoftDotNetCommonItemTemplatesPackageVersion> <MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.308</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.111-servicing.23425.44</MicrosoftNETSdkPackageVersion> <MicrosoftNETSdkPackageVersion>7.0.308-servicing.23425.45</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.111-servicing.23425.44</MicrosoftDotNetMSBuildSdkResolverPackageVersion> <MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.308-servicing.23425.45</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion> <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion> <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion> <MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>4.6.0-3.23329.3</MicrosoftNetCompilersToolsetPackageVersion>
</PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/corefx --> <!-- Dependencies from https://github.com/dotnet/corefx -->
<MicrosoftNETCorePlatformsPackageVersion>7.0.4</MicrosoftNETCorePlatformsPackageVersion> <MicrosoftNETCorePlatformsPackageVersion>7.0.4</MicrosoftNETCorePlatformsPackageVersion>
@ -193,7 +197,7 @@
<PropertyGroup> <PropertyGroup>
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion> <VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion> <DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
<MicrosoftNETTestSdkVersion>17.4.1-release-20230405-06</MicrosoftNETTestSdkVersion> <MicrosoftNETTestSdkVersion>17.6.3</MicrosoftNETTestSdkVersion>
</PropertyGroup> </PropertyGroup>
<!-- dependencies for source-build tarball --> <!-- dependencies for source-build tarball -->
<PropertyGroup> <PropertyGroup>
@ -215,7 +219,6 @@
or minor release, prebuilts may be needed. When the release is mature, prebuilts are not or minor release, prebuilts may be needed. When the release is mature, prebuilts are not
necessary, and this property is removed from the file. necessary, and this property is removed from the file.
--> -->
<PrivateSourceBuiltSDKVersion>7.0.111</PrivateSourceBuiltSDKVersion>
<PrivateSourceBuiltArtifactsPackageVersion>7.0.111</PrivateSourceBuiltArtifactsPackageVersion> <PrivateSourceBuiltArtifactsPackageVersion>7.0.111</PrivateSourceBuiltArtifactsPackageVersion>
</PropertyGroup> </PropertyGroup>
<!-- Workload manifest package versions --> <!-- Workload manifest package versions -->

2
eng/restore-toolset.ps1
View file

@ -29,6 +29,8 @@ set DOTNET_MULTILEVEL_LOOKUP=0
set PATH=$env:DOTNET_INSTALL_DIR;%PATH% set PATH=$env:DOTNET_INSTALL_DIR;%PATH%
set NUGET_PACKAGES=$env:NUGET_PACKAGES set NUGET_PACKAGES=$env:NUGET_PACKAGES
set DOTNET_ROOT=$env:DOTNET_INSTALL_DIR
"@ "@
Out-File -FilePath $scriptPath -InputObject $scriptContents -Encoding ASCII Out-File -FilePath $scriptPath -InputObject $scriptContents -Encoding ASCII

16
eng/source-build-tarball-build-official.yml
View file

@ -7,12 +7,16 @@ resources:
trigger: trigger:
branches: branches:
include: include:
- release/6.0.1xx - main
- internal/release/6.0.1xx* - release/*
- internal/release/*/6.0.1xx* - internal/release/*
- release/7.0.1xx exclude:
- internal/release/7.0.1xx* - release/7.0.2xx
- internal/release/*/7.0.1xx* - internal/release/7.0.2xx
- release/7.0.3xx
- internal/release/7.0.3xx
- release/7.0.4xx
- internal/release/7.0.4xx
stages: stages:
- build - build

6
global.json
View file

@ -1,6 +1,6 @@
{ {
"tools": { "tools": {
"dotnet": "7.0.110", "dotnet": "7.0.111",
"runtimes": { "runtimes": {
"dotnet": [ "dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)"
@ -11,7 +11,7 @@
"cmake": "3.16.4" "cmake": "3.16.4"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23408.3", "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23478.1",
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23408.3" "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23478.1"
} }
} }

8
src/SourceBuild/tarball/content/repos/aspnetcore.proj
View file

@ -25,8 +25,12 @@
<!-- CS0618 - Caused from deprecated IOperation.Children in <!-- CS0618 - Caused from deprecated IOperation.Children in
Microsoft.CodeAnalysis 4.3.0, but aspnetcore references version 4.2.0. Microsoft.CodeAnalysis 4.3.0, but aspnetcore references version 4.2.0.
Requires https://github.com/dotnet/source-build/issues/2482 --> Requires https://github.com/dotnet/source-build/issues/2482
<RepoNoWarns>CS0618</RepoNoWarns> CS8600 - Converting null literal or possible null value to non-nullable type.
Requires https://github.com/dotnet/aspnetcore/issues/45882.
CS8604 - Possible null reference argument for parameter.
Requires https://github.com/dotnet/aspnetcore/issues/45882. -->
<RepoNoWarns>CS0618;CA1825;CS8600;CS8604</RepoNoWarns>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

1
src/SourceBuild/tarball/content/repos/format.proj
View file

@ -7,6 +7,7 @@
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile> <GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile> <NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
<OutputPlacementRepoApiImplemented>false</OutputPlacementRepoApiImplemented> <OutputPlacementRepoApiImplemented>false</OutputPlacementRepoApiImplemented>
<RepoNoWarns>CS9057</RepoNoWarns>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
src/SourceBuild/tarball/content/repos/installer.proj
View file

@ -51,6 +51,8 @@
<!-- This repo uses text-only template packages from the internal transport feed. --> <!-- This repo uses text-only template packages from the internal transport feed. -->
<SetUpInternalTransportFeed>true</SetUpInternalTransportFeed> <SetUpInternalTransportFeed>true</SetUpInternalTransportFeed>
<RepoNoWarns>CS9057</RepoNoWarns>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
src/SourceBuild/tarball/content/repos/known-good.proj
View file

@ -34,7 +34,7 @@
<!-- Tier 1 --> <!-- Tier 1 -->
<RepositoryReference Include="command-line-api" /> <RepositoryReference Include="command-line-api" />
<RepositoryReference Include="diagnostics" /> <RepositoryReference Include="diagnostics" />
<RepositoryReference Include="razor-compiler" /> <RepositoryReference Include="razor" />
<RepositoryReference Include="xliff-tasks" /> <RepositoryReference Include="xliff-tasks" />
<RepositoryReference Include="roslyn" /> <RepositoryReference Include="roslyn" />
<RepositoryReference Include="source-build-externals" /> <RepositoryReference Include="source-build-externals" />

1
src/SourceBuild/tarball/content/repos/nuget-client.proj
View file

@ -6,6 +6,7 @@
<RepoApiImplemented>false</RepoApiImplemented> <RepoApiImplemented>false</RepoApiImplemented>
<DependencyVersionInputRepoApiImplemented>true</DependencyVersionInputRepoApiImplemented> <DependencyVersionInputRepoApiImplemented>true</DependencyVersionInputRepoApiImplemented>
<DeterministicBuildOptOut>true</DeterministicBuildOptOut> <DeterministicBuildOptOut>true</DeterministicBuildOptOut>
<RepoNoWarns>CS9057</RepoNoWarns>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

0
src/SourceBuild/tarball/content/repos/razor-compiler.proj → src/SourceBuild/tarball/content/repos/razor.proj
View file

2
src/SourceBuild/tarball/content/repos/sdk.proj
View file

@ -42,7 +42,7 @@
<RepositoryReference Include="fsharp" /> <RepositoryReference Include="fsharp" />
<RepositoryReference Include="format" /> <RepositoryReference Include="format" />
<RepositoryReference Include="deployment-tools" /> <RepositoryReference Include="deployment-tools" />
<RepositoryReference Include="razor-compiler" /> <RepositoryReference Include="razor" />
</ItemGroup> </ItemGroup>
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" /> <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

22
src/SourceBuild/tarball/patches/aspnetcore/0002-IDE0060-workaround.patch Normal file
View file

@ -0,0 +1,22 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: MichaelSimons <msimons@microsoft.com>
Date: Fri, 12 Aug 2022 23:02:54 +0000
Subject: [PATCH] IDE0060 workaround
Backport: https://github.com/dotnet/roslyn-analyzers/issues/6228
---
src/Http/Routing/src/Matching/Ascii.cs | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/Http/Routing/src/Matching/Ascii.cs b/src/Http/Routing/src/Matching/Ascii.cs
index 081af0bb07..393a9eb65f 100644
--- a/src/Http/Routing/src/Matching/Ascii.cs
+++ b/src/Http/Routing/src/Matching/Ascii.cs
@@ -12,7 +12,6 @@ internal static class Ascii
// and we know that the spans are the same length.
//
// Similar to https://github.com/dotnet/coreclr/blob/master/src/System.Private.CoreLib/shared/System/Globalization/CompareInfo.cs#L549
- [MethodImpl(MethodImplOptions.AggressiveInlining)]
public static bool AsciiIgnoreCaseEquals(ReadOnlySpan<char> a, ReadOnlySpan<char> b, int length)
{
// The caller should have checked the length. We enforce that here by THROWING if the

24
src/SourceBuild/tarball/patches/aspnetcore/0003-Address-obsolete-errors.patch Normal file
View file

@ -0,0 +1,24 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: MichaelSimons <msimons@microsoft.com>
Date: Thu, 27 Oct 2022 02:47:08 +0000
Subject: [PATCH] Address obsolete errors
Backport: https://github.com/dotnet/aspnetcore/pull/44734
---
src/Servers/Kestrel/Core/src/KestrelServerOptions.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs b/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs
index f31880e891..fc6322dd41 100644
--- a/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs
+++ b/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs
@@ -252,9 +252,6 @@ public class KestrelServerOptions
writer.WritePropertyName(nameof(AllowResponseHeaderCompression));
writer.WriteBooleanValue(AllowResponseHeaderCompression);
- writer.WritePropertyName(nameof(EnableAltSvc));
- writer.WriteBooleanValue(EnableAltSvc);
-
writer.WritePropertyName(nameof(IsDevCertLoaded));
writer.WriteBooleanValue(IsDevCertLoaded);

73
src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch
View file

@ -1,73 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Mon, 26 Jun 2023 23:46:46 +0000
Subject: [PATCH] Add explicit System.Text.Json dependency
Adding an excplicit System.Text.Json dependency to prevent transitive dependency to be picked up
from PSB, via Microsoft.Build package.
Backport: https://github.com/dotnet/format/pull/1887
---
Directory.Packages.props | 1 +
eng/Version.Details.xml | 4 ++++
eng/Versions.props | 2 ++
src/dotnet-format.csproj | 6 ++++++
4 files changed, 13 insertions(+)
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 6b628c22..c9f86593 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -36,5 +36,6 @@
<PackageVersion Include="NuGet.Versioning" Version="$(NuGetVersion)" />
<PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
<PackageVersion Include="System.CommandLine.Rendering" Version="$(SystemCommandLineRenderingVersion)" />
+ <PackageVersion Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index cdfa5f5e..86f02b44 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,6 +13,10 @@
<Uri>https://github.com/dotnet/command-line-api</Uri>
<Sha>e5861a73ad3f08c820319b56b302387a8832ed59</Sha>
</Dependency>
+ <Dependency Name="System.Text.Json" Version="6.0.8">
+ <Uri>https://github.com/dotnet/runtime</Uri>
+ <Sha>3241df7f2b0f3e2dada8d07229723c79fdbe4991</Sha>
+ </Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22466.3">
diff --git a/eng/Versions.props b/eng/Versions.props
index 27582078..bccaf176 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -20,6 +20,8 @@
<!-- Dependencies from https://github.com/dotnet/command-line-api -->
<SystemCommandLineVersion>2.0.0-beta4.22430.1</SystemCommandLineVersion>
<SystemCommandLineRenderingVersion>0.4.0-alpha.22430.1</SystemCommandLineRenderingVersion>
+ <!-- Dependencies from https://github.com/dotnet/runtime -->
+ <SystemTextJsonVersion>6.0.8</SystemTextJsonVersion>
</PropertyGroup>
<!--
Other Dependency versions
diff --git a/src/dotnet-format.csproj b/src/dotnet-format.csproj
index 5f691e6e..d812f06b 100644
--- a/src/dotnet-format.csproj
+++ b/src/dotnet-format.csproj
@@ -54,6 +54,12 @@
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" />
<PackageReference Include="Microsoft.Extensions.Logging" />
+
+ <!--
+ Explicit System.Text.Json package reference is required for source-build to pick up the live package.
+ Avoids picking up an old version via transitive dependency from Microsoft.Build or Microsoft.CodeAnalysis.Workspaces.MSBuild.
+ -->
+ <PackageReference Include="System.Text.Json" Condition=" '$(DotnetBuildFromSource)' == 'true'" />
</ItemGroup>
<ItemGroup>

2
src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs
View file

@ -53,7 +53,7 @@ namespace Microsoft.DotNet.Cli.Build
foreach (var file in files) foreach (var file in files)
{ {
sb.Append(@" file source=""!(bindpath.sources)\Redist\Common\NetCoreSDK\MSBuildExtensions\"); sb.Append(@" file source=""$(PkgVS_Redist_Common_Net_Core_SDK_MSBuildExtensions)\");
sb.Append(Path.Combine(relativeSourcePath, Path.GetFileName(file))); sb.Append(Path.Combine(relativeSourcePath, Path.GetFileName(file)));
sb.AppendLine("\""); sb.AppendLine("\"");
} }

1
src/redist/targets/GenerateBundledVersions.targets
View file

@ -335,6 +335,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<NetCoreRoot Condition="'%24(NetCoreRoot)' == ''">%24([MSBuild]::NormalizePath('%24(MSBuildThisFileDirectory)..\..\'))</NetCoreRoot> <NetCoreRoot Condition="'%24(NetCoreRoot)' == ''">%24([MSBuild]::NormalizePath('%24(MSBuildThisFileDirectory)..\..\'))</NetCoreRoot>
<NetCoreTargetingPackRoot Condition="'%24(NetCoreTargetingPackRoot)' == ''">%24([MSBuild]::EnsureTrailingSlash('%24(NetCoreRoot)'))packs</NetCoreTargetingPackRoot> <NetCoreTargetingPackRoot Condition="'%24(NetCoreTargetingPackRoot)' == ''">%24([MSBuild]::EnsureTrailingSlash('%24(NetCoreRoot)'))packs</NetCoreTargetingPackRoot>
<_NetFrameworkHostedCompilersVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</_NetFrameworkHostedCompilersVersion>
<NETCoreAppMaximumVersion>$(_NETCoreAppTargetFrameworkVersion)</NETCoreAppMaximumVersion> <NETCoreAppMaximumVersion>$(_NETCoreAppTargetFrameworkVersion)</NETCoreAppMaximumVersion>
<BundledNETCoreAppTargetFrameworkVersion>$(_NETCoreAppTargetFrameworkVersion)</BundledNETCoreAppTargetFrameworkVersion> <BundledNETCoreAppTargetFrameworkVersion>$(_NETCoreAppTargetFrameworkVersion)</BundledNETCoreAppTargetFrameworkVersion>
<BundledNETCoreAppPackageVersion>$(_NETCoreAppPackageVersion)</BundledNETCoreAppPackageVersion> <BundledNETCoreAppPackageVersion>$(_NETCoreAppPackageVersion)</BundledNETCoreAppPackageVersion>

85
test/EndToEnd/ProjectBuildTests.cs
View file

@ -2,6 +2,7 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information. // Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System; using System;
using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
@ -115,7 +116,7 @@ namespace EndToEnd.Tests
.Execute(newArgs) .Execute(newArgs)
.Should().Pass(); .Should().Pass();
string publishArgs="-r win-arm64"; string publishArgs = "-r win-arm64";
new PublishCommand() new PublishCommand()
.WithWorkingDirectory(projectDirectory) .WithWorkingDirectory(projectDirectory)
.Execute(publishArgs) .Execute(publishArgs)
@ -149,7 +150,7 @@ namespace EndToEnd.Tests
.Execute(newArgs) .Execute(newArgs)
.Should().Pass(); .Should().Pass();
string publishArgs="-r win-arm64"; string publishArgs = "-r win-arm64";
new PublishCommand() new PublishCommand()
.WithWorkingDirectory(projectDirectory) .WithWorkingDirectory(projectDirectory)
.Execute(publishArgs) .Execute(publishArgs)
@ -248,6 +249,47 @@ namespace EndToEnd.Tests
Assert.True(directory.EnumerateFileSystemInfos().Any()); Assert.True(directory.EnumerateFileSystemInfos().Any());
} }
[Theory]
// microsoft.dotnet.common.itemtemplates templates
[InlineData("class")]
[InlineData("struct")]
[InlineData("enum")]
[InlineData("record")]
[InlineData("interface")]
[InlineData("class", "C#")]
[InlineData("class", "VB")]
[InlineData("struct", "VB")]
[InlineData("enum", "VB")]
[InlineData("interface", "VB")]
public void ItCanCreateItemTemplateWithProjectRestriction(string templateName, string language = "")
{
var languageExtensionMap = new Dictionary<string, string>()
{
{ "", ".cs" },
{ "C#", ".cs" },
{ "VB", ".vb" }
};
DirectoryInfo directory = InstantiateProjectTemplate("classlib", language, withNoRestore: false);
string projectDirectory = directory.FullName;
string expectedItemName = $"TestItem_{templateName}";
string newArgs = $"{templateName} --name {expectedItemName} --debug:ephemeral-hive";
if (!string.IsNullOrWhiteSpace(language))
{
newArgs += $" --language {language}";
}
new NewCommandShim()
.WithWorkingDirectory(projectDirectory)
.Execute(newArgs)
.Should().Pass();
//check if the template created files
Assert.True(directory.Exists);
Assert.True(directory.EnumerateFileSystemInfos().Any());
Assert.True(directory.GetFile($"{expectedItemName}.{languageExtensionMap[language]}") != null);
}
[WindowsOnlyTheory] [WindowsOnlyTheory]
[InlineData("wpf", Skip = "https://github.com/dotnet/wpf/issues/2363")] [InlineData("wpf", Skip = "https://github.com/dotnet/wpf/issues/2363")]
[InlineData("winforms", Skip = "https://github.com/dotnet/wpf/issues/2363")] [InlineData("winforms", Skip = "https://github.com/dotnet/wpf/issues/2363")]
@ -402,20 +444,9 @@ namespace EndToEnd.Tests
private static void TestTemplateCreateAndBuild(string templateName, bool build = true, bool selfContained = false, string language = "", string framework = "") private static void TestTemplateCreateAndBuild(string templateName, bool build = true, bool selfContained = false, string language = "", string framework = "")
{ {
DirectoryInfo directory = TestAssets.CreateTestDirectory(identifier: string.IsNullOrWhiteSpace(language) ? templateName : $"{templateName}[{language}]"); DirectoryInfo directory = InstantiateProjectTemplate(templateName, language);
string projectDirectory = directory.FullName; string projectDirectory = directory.FullName;
string newArgs = $"{templateName} --debug:ephemeral-hive --no-restore";
if (!string.IsNullOrWhiteSpace(language))
{
newArgs += $" --language {language}";
}
new NewCommandShim()
.WithWorkingDirectory(projectDirectory)
.Execute(newArgs)
.Should().Pass();
if (!string.IsNullOrWhiteSpace(framework)) if (!string.IsNullOrWhiteSpace(framework))
{ {
//check if MSBuild TargetFramework property for *proj is set to expected framework //check if MSBuild TargetFramework property for *proj is set to expected framework
@ -439,13 +470,13 @@ namespace EndToEnd.Tests
{ {
buildArgs += $" --framework {framework}"; buildArgs += $" --framework {framework}";
} }
// Remove this (or formalize it) after https://github.com/dotnet/installer/issues/12479 is resolved. // Remove this (or formalize it) after https://github.com/dotnet/installer/issues/12479 is resolved.
if (language == "F#") if (language == "F#")
{ {
buildArgs += $" /p:_NETCoreSdkIsPreview=true"; buildArgs += $" /p:_NETCoreSdkIsPreview=true";
} }
string dotnetRoot = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest); string dotnetRoot = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest);
new BuildCommand() new BuildCommand()
.WithEnvironmentVariable("PATH", dotnetRoot) // override PATH since razor rely on PATH to find dotnet .WithEnvironmentVariable("PATH", dotnetRoot) // override PATH since razor rely on PATH to find dotnet
@ -454,5 +485,27 @@ namespace EndToEnd.Tests
.Should().Pass(); .Should().Pass();
} }
} }
private static DirectoryInfo InstantiateProjectTemplate(string templateName, string language = "", bool withNoRestore = true)
{
DirectoryInfo directory = TestAssets.CreateTestDirectory(
identifier: string.IsNullOrWhiteSpace(language)
? templateName
: $"{templateName}[{language}]");
string projectDirectory = directory.FullName;
string newArgs = $"{templateName} --debug:ephemeral-hive {(withNoRestore ? "--no-restore" : "")}";
if (!string.IsNullOrWhiteSpace(language))
{
newArgs += $" --language {language}";
}
new NewCommandShim()
.WithWorkingDirectory(projectDirectory)
.Execute(newArgs)
.Should().Pass();
return directory;
}
} }
} }