Skip to content

Commit 68cfd9e

Browse files
dsplaisteddsplaisted
committed
Merge upstream changes
2 parents 3e2b37f + d7371b6 commit 68cfd9e

File tree

16 files changed

+76
-66
lines changed

16 files changed

+76
-66
lines changed

‎.azuredevops/dependabot.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
version: 2
2+
3+
# Disabling dependabot on Azure DevOps as this is a mirrored repo. Updates should go through github.
4+
enable-campaigned-updates: false
5+
enable-security-updates: false

‎CODEOWNERS‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
/src/WasmSdk @lewing @akoeplinger @pavelsavara @maraf
3232

3333
# Area-Format
34-
/src/Cli/dotnet/commands/dotnet-format @phil-allen-msft
34+
/src/Cli/dotnet/Commands/Format @phil-allen-msft
3535
/test/dotnet-format.UnitTests @phil-allen-msft
3636

3737
# Area-NuGet
@@ -47,21 +47,21 @@
4747
/test/dotnet.Tests/CommandTests/Restore @dotnet/nuget-team
4848

4949
# Area-FSharp
50-
/src/Cli/dotnet/commands/dotnet-fsi @dotnet/fsharp
50+
/src/Cli/dotnet/Commands/Fsi @dotnet/fsharp
5151
/test/dotnet-fsi.Tests @dotnet/fsharp
5252

5353
# Area-DotNet Test
54-
/src/Cli/dotnet/commands/dotnet-test @dotnet/dotnet-testing-admin
55-
/src/Cli/dotnet/commands/dotnet-vstest @dotnet/dotnet-testing-admin
56-
/test/dotnet-test.Tests @dotnet/dotnet-testing-admin
57-
/test/dotnet-vstest.Tests @dotnet/dotnet-testing-admin
54+
/src/Cli/dotnet/Commands/Test @dotnet/dotnet-testing-admin
55+
/src/Cli/dotnet/Commands/VSTest @dotnet/dotnet-testing-admin
56+
/test/dotnet.Tests/CommandTests/Test @dotnet/dotnet-testing-admin
57+
/test/dotnet.Tests/CommandTests/VSTest @dotnet/dotnet-testing-admin
5858
/test/dotnet-new.IntegrationTests @dotnet/dotnet-testing-admin
5959
/template_feed/Microsoft.DotNet.Common.*/content/MSTest* @dotnet/dotnet-testing-admin
6060
/template_feed/Microsoft.DotNet.Common.*/content/NUnit* @dotnet/dotnet-testing-admin
6161
/template_feed/Microsoft.DotNet.Common.*/content/XUnit* @dotnet/dotnet-testing-admin
6262

6363
# Area-Templates
64-
/src/Cli/dotnet/commands/dotnet-new @dotnet/templating-engine-maintainers
64+
/src/Cli/dotnet/Commands/New @dotnet/templating-engine-maintainers
6565
/src/Cli/Microsoft.TemplateEngine.Cli @dotnet/templating-engine-maintainers
6666
/test/dotnet-new.IntegrationTests @dotnet/templating-engine-maintainers
6767
/test/Microsoft.TemplateEngine.* @dotnet/templating-engine-maintainers
@@ -117,4 +117,4 @@
117117
# Area-Infrastructure
118118
.vsts-ci.yml @MiYanni
119119
.vsts-pr.yml @MiYanni
120-
/eng/pipelines @MiYanni
120+
/eng/pipelines @MiYanni

‎eng/Versions.props‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
55
</PropertyGroup>
66
<PropertyGroup Label="Repo version information">
7-
<VersionMajor>10</VersionMajor>
7+
<VersionMajor>11</VersionMajor>
88
<VersionMinor>0</VersionMinor>
99
<VersionSDKMinor>2</VersionSDKMinor>
1010
<VersionFeature>00</VersionFeature>
@@ -14,13 +14,14 @@
1414
<SdkFeatureBand>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)00</SdkFeatureBand>
1515
<BuiltinWorkloadFeatureBand>$(VersionMajor).$(VersionMinor).100</BuiltinWorkloadFeatureBand>
1616
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
17+
<PreviousVersionPrefix>10.0.100</PreviousVersionPrefix>
1718
<MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
1819
<CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>
1920
<!-- Enable to remove prerelease label. -->
2021
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
2122
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
2223
<!-- Calculate prerelease label -->
23-
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">preview</PreReleaseVersionLabel>
24+
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">alpha</PreReleaseVersionLabel>
2425
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and $(VersionPrefix.EndsWith('00'))">rtm</PreReleaseVersionLabel>
2526
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and !$(VersionPrefix.EndsWith('00'))">servicing</PreReleaseVersionLabel>
2627
<PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'">0</PreReleaseVersionIteration>

‎src/Cli/Microsoft.DotNet.Cli.Utils/Product.cs‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public static class Product
99
{
1010
public static string LongName => LocalizableStrings.DotNetSdkInfo;
1111
public static readonly string Version;
12-
public static readonly string TargetFrameworkVersion;
12+
public static readonly string TargetFrameworkVersion = "10.0";
1313

1414
static Product()
1515
{
@@ -19,18 +19,5 @@ static Product()
1919
typeof(Product).GetTypeInfo().Assembly.Location)
2020
.ProductVersion ??
2121
string.Empty;
22-
23-
int firstDotIndex = Version.IndexOf('.');
24-
if (firstDotIndex >= 0)
25-
{
26-
int secondDotIndex = Version.IndexOf('.', firstDotIndex + 1);
27-
TargetFrameworkVersion = secondDotIndex >= 0
28-
? Version.Substring(0, secondDotIndex)
29-
: Version;
30-
}
31-
else
32-
{
33-
TargetFrameworkVersion = string.Empty;
34-
}
3522
}
3623
}

‎src/Layout/Directory.Build.targets‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
<FullNugetVersion Condition="'$(VersionSuffixDateStamp)' != '' and '$(VersionSuffixBuildOfTheDay)' != ''">$(FullNugetVersion).$(VersionSuffixDateStamp).$(VersionSuffixBuildOfTheDay)</FullNugetVersion>
1515

1616
<PgoTerm Condition="'$(PgoInstrument)' == 'true'">-pgo</PgoTerm>
17-
<ArtifactNameWithVersionSdk>dotnet-sdk-internal$(PgoTerm)-$(FullNugetVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionSdk>
17+
<!-- <ArtifactNameWithVersionSdk>dotnet-sdk-internal$(PgoTerm)-$(FullNugetVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionSdk> -->
18+
<ArtifactNameWithVersionSdk>dotnet-sdk-internal$(PgoTerm)-10.0.100-rtm-$(ProductMonikerRid)</ArtifactNameWithVersionSdk>
1819
<ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>dotnet-sdk$(PgoTerm)-$(Version)-$(ProductMonikerRid)</ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
1920

2021
<SdkMSIInstallerFileName>$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkMSIInstallerFileName>

‎src/Layout/VS.Redist.Common.NetCore.Templates/VS.Redist.Common.NetCore.Templates.proj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717

1818
<Target Name="GenerateLayout" Condition="'$(IsPackable)' == 'true'" DependsOnTargets="ResolveProjectReferences">
1919
<ItemGroup>
20-
<Content Include="$(ArtifactsNonShippingPackagesDir)dotnet-$(VersionMajor)$(VersionMinor)templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)" PackagePath="/" />
20+
<!-- <Content Include="$(ArtifactsNonShippingPackagesDir)dotnet-$(VersionMajor)$(VersionMinor)templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)" PackagePath="/" /> -->
21+
<Content Include="$(ArtifactsNonShippingPackagesDir)dotnet-100templates-10.0.100-rtm-$(ProductMonikerRid)$(InstallerExtension)" PackagePath="/" />
2122
</ItemGroup>
2223
</Target>
2324

‎src/Layout/redist/targets/BundledTemplates.targets‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
</ItemGroup>
99

1010
<ItemGroup>
11-
<CurrentVersionBundledTemplates Include="@(Bundled100Templates)" TemplateFrameworkVersion="$(MajorMinorVersion)" />
11+
<!-- <CurrentVersionBundledTemplates Include="@(Bundled100Templates)" TemplateFrameworkVersion="$(MajorMinorVersion)" /> -->
12+
<CurrentVersionBundledTemplates Include="@(Bundled100Templates)" TemplateFrameworkVersion="10.0" />
1213
<BundledTemplates Include="@(CurrentVersionBundledTemplates)" />
1314
<BundledTemplates Update="@(BundledTemplates)">
1415
<NupkgPathRelativeToPackageRoot>%(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg</NupkgPathRelativeToPackageRoot>
@@ -28,19 +29,30 @@
2829
<_ArcadePatchNumber>$([MSBuild]::ValueOrDefault('$(_PatchNumber)', '000000'))</_ArcadePatchNumber>
2930
</PropertyGroup>
3031

31-
<CalculateTemplateVersions
32+
<!-- <CalculateTemplateVersions
3233
BundledTemplates="@(BundledTemplates)"
3334
FullNugetVersion="$(FullNugetVersion)"
3435
ProductMonikerRid="$(ProductMonikerRid)"
3536
InstallerExtension="$(InstallerExtension)"
3637
CombinedBuildNumberAndRevision="$(_ArcadePatchNumber)">
3738
<Output TaskParameter="BundledTemplatesWithInstallPaths" ItemName="BundledTemplatesWithInstallPaths" />
3839
<Output TaskParameter="TemplatesComponents" ItemName="TemplatesComponents" />
40+
</CalculateTemplateVersions> -->
41+
42+
<CalculateTemplateVersions
43+
BundledTemplates="@(BundledTemplates)"
44+
FullNugetVersion="10.0.100-rtm"
45+
ProductMonikerRid="$(ProductMonikerRid)"
46+
InstallerExtension="$(InstallerExtension)"
47+
CombinedBuildNumberAndRevision="$(_ArcadePatchNumber)">
48+
<Output TaskParameter="BundledTemplatesWithInstallPaths" ItemName="BundledTemplatesWithInstallPaths" />
49+
<Output TaskParameter="TemplatesComponents" ItemName="TemplatesComponents" />
3950
</CalculateTemplateVersions>
4051

4152
<ItemGroup>
4253
<TemplatesComponents>
43-
<MSIInstallerFile>$(ArtifactsNonShippingPackagesDir)%(TemplatesComponents.TemplateBaseFilename)-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</MSIInstallerFile>
54+
<!-- <MSIInstallerFile>$(ArtifactsNonShippingPackagesDir)%(TemplatesComponents.TemplateBaseFilename)-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</MSIInstallerFile> -->
55+
<MSIInstallerFile>$(ArtifactsNonShippingPackagesDir)%(TemplatesComponents.TemplateBaseFilename)-10.0.100-rtm-$(ProductMonikerRid)$(InstallerExtension)</MSIInstallerFile>
4456
</TemplatesComponents>
4557
</ItemGroup>
4658
</Target>

‎src/Layout/redist/targets/GenerateMSIs.targets‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,9 @@
223223
Outputs="$(SdkBundleFile)">
224224
<!-- Choose "latest" template MSI to go in bundle. -->
225225
<ItemGroup>
226-
<LatestTemplateInstallerComponent Include="@(TemplatesMsi)" Condition="'%(TemplatesMajorMinorVersion)' == '$(MajorMinorVersion)'"/>
226+
<!-- While we don't have 11.0 templates available (need SDK update, choose the 10.0 templates -->
227+
<!-- <LatestTemplateInstallerComponent Include="@(TemplatesMsi)" Condition="'%(TemplatesMajorMinorVersion)' == '$(MajorMinorVersion)'"/> -->
228+
<LatestTemplateInstallerComponent Include="@(TemplatesMsi)" Condition="'%(TemplatesMajorMinorVersion)' == '10.0'"/>
227229
</ItemGroup>
228230

229231
<PropertyGroup>

‎src/Layout/redist/targets/RestoreLayout.targets‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
<DownloadedWindowsDesktopTargetingPackInstallerFileName Condition="'$(InstallerExtension)' != ''">windowsdesktop-targeting-pack-$(MicrosoftWindowsDesktopAppRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedWindowsDesktopTargetingPackInstallerFileName>
3030

3131
<SdkMSIInstallerFileName>$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkMSIInstallerFileName>
32-
<SdkTemplatesMSIInstallerFileName>dotnet-$(VersionMajor)$(VersionMinor)templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</SdkTemplatesMSIInstallerFileName>
32+
<!-- <SdkTemplatesMSIInstallerFileName>dotnet-$(VersionMajor)$(VersionMinor)templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</SdkTemplatesMSIInstallerFileName> -->
33+
<SdkTemplatesMSIInstallerFileName>dotnet-100templates-10.0.100-rtm-$(ProductMonikerRid)$(InstallerExtension)</SdkTemplatesMSIInstallerFileName>
3334

3435
<CombinedFrameworkHostArchiveFileName>dotnet-runtime-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</CombinedFrameworkHostArchiveFileName>
3536
<WinFormsAndWpfSharedFxArchiveFileName>windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</WinFormsAndWpfSharedFxArchiveFileName>

‎src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.Package.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<_GenerateDocumentationAndConfigFilesPath>%(_GenerateDocumentationAndConfigFilesPath.Identity)</_GenerateDocumentationAndConfigFilesPath>
9090
</PropertyGroup>
9191

92-
<Exec Command='"$(DotNetTool)" "$(_GenerateDocumentationAndConfigFilesPath)" "-validateOnly:$(ValidateOnlyFlag)" "$(GeneratedRulesetsDir)" "$(GeneratedEditorconfigsDir)" "$(GeneratedGlobalAnalyzerConfigsDir)" "$(ArtifactsBinDir)$(EscapeDirectorySuffix)" "$(Configuration)" "$(TargetFramework)" "@(AnalyzerNupkgAssembly)" "$(PackagePropsTargetsFileDir)" "$(PackagePropsFileName)" "$(PackagePropsTargetsFileDir)" "$(PackageTargetsFileName)" "$(DisableNETAnalyzersPackagePropsFileName)" "$(AnalyzerDocumentationFileDir)" "$(AnalyzerDocumentationFileName)" "$(AnalyzerSarifFileDir)" "$(AnalyzerSarifFileName)" "$(VersionPrefix)" $(PackageId) $(ContainsPortedFxCopRules) $(GenerateAnalyzerRulesMissingDocumentationFile) $(ReleaseTrackingOptOut) $(_ValidateOffline)' />
92+
<Exec Command='"$(DotNetTool)" "$(_GenerateDocumentationAndConfigFilesPath)" "-validateOnly:$(ValidateOnlyFlag)" "$(GeneratedRulesetsDir)" "$(GeneratedEditorconfigsDir)" "$(GeneratedGlobalAnalyzerConfigsDir)" "$(ArtifactsBinDir)$(EscapeDirectorySuffix)" "$(Configuration)" "$(TargetFramework)" "@(AnalyzerNupkgAssembly)" "$(PackagePropsTargetsFileDir)" "$(PackagePropsFileName)" "$(PackagePropsTargetsFileDir)" "$(PackageTargetsFileName)" "$(DisableNETAnalyzersPackagePropsFileName)" "$(AnalyzerDocumentationFileDir)" "$(AnalyzerDocumentationFileName)" "$(AnalyzerSarifFileDir)" "$(AnalyzerSarifFileName)" "$(PreviousVersionPrefix)" $(PackageId) $(ContainsPortedFxCopRules) $(GenerateAnalyzerRulesMissingDocumentationFile) $(ReleaseTrackingOptOut) $(_ValidateOffline)' />
9393
</Target>
9494

9595
</Project>

0 commit comments

Comments
 (0)