Merge branch 'main' of https://github.com/dotnet/installer into darc-main-fefc17e7-7f63-4b88-af67-3281e9e6e09f
This commit is contained in:
MichaelSimons
commit
9b82c9ad62
42 changed files with 154 additions and 205 deletions
43
.vsts-ci.yml
43
.vsts-ci.yml
|
|
@ -52,11 +52,11 @@ stages:
|
|||
- job: Publish_Build_Configuration
|
||||
pool:
|
||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
name: NetCore-Svc-Public
|
||||
demands: ImageOverride -equals build.windows.10.amd64.vs2019.open
|
||||
name: NetCore-Public
|
||||
demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open
|
||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
name: NetCore1ESPool-Svc-Internal
|
||||
demands: ImageOverride -equals build.windows.10.amd64.vs2019
|
||||
name: NetCore1ESPool-Internal
|
||||
demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre
|
||||
steps:
|
||||
- publish: $(Build.SourcesDirectory)\eng\BuildConfiguration
|
||||
artifact: BuildConfiguration
|
||||
|
|
@ -66,11 +66,11 @@ stages:
|
|||
agentOs: Windows_NT
|
||||
pool:
|
||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
name: NetCore-Svc-Public
|
||||
demands: ImageOverride -equals build.windows.10.amd64.vs2019.open
|
||||
name: NetCore-Public
|
||||
demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open
|
||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
name: NetCore1ESPool-Svc-Internal
|
||||
demands: ImageOverride -equals build.windows.10.amd64.vs2019
|
||||
name: NetCore1ESPool-Internal
|
||||
demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre
|
||||
timeoutInMinutes: 180
|
||||
strategy:
|
||||
matrix:
|
||||
|
|
@ -110,8 +110,8 @@ stages:
|
|||
agentOs: Windows_NT
|
||||
pool:
|
||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
name: NetCore1ESPool-Svc-Internal
|
||||
demands: ImageOverride -equals build.windows.10.amd64.vs2019
|
||||
name: NetCore1ESPool-Internal
|
||||
demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre
|
||||
timeoutInMinutes: 180
|
||||
strategy:
|
||||
matrix:
|
||||
|
|
@ -142,10 +142,10 @@ stages:
|
|||
agentOs: Linux
|
||||
pool:
|
||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
name: NetCore-Svc-Public
|
||||
name: NetCore-Public
|
||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
|
||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
name: NetCore1ESPool-Svc-Internal
|
||||
name: NetCore1ESPool-Internal
|
||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
|
||||
timeoutInMinutes: 180
|
||||
strategy:
|
||||
|
|
@ -286,7 +286,7 @@ stages:
|
|||
agentOs: Linux
|
||||
pool:
|
||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
name: NetCore1ESPool-Svc-Internal
|
||||
name: NetCore1ESPool-Internal
|
||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
|
||||
timeoutInMinutes: 180
|
||||
strategy:
|
||||
|
|
@ -337,19 +337,6 @@ stages:
|
|||
dependsOn: Source_Build_Create_Tarball
|
||||
condition: eq(dependencies.Source_Build_Create_Tarball.outputs['Tarball_Build_Check._includeTarballBuild'], 'true')
|
||||
|
||||
# https://github.com/dotnet/core-sdk/issues/248
|
||||
# - template: /eng/build.yml
|
||||
# parameters:
|
||||
# agentOs: FreeBSD
|
||||
# queue:
|
||||
# name: dnceng-freebsd-internal
|
||||
# timeoutInMinutes: 180
|
||||
# matrix:
|
||||
# Build_Release:
|
||||
# _BuildConfig: Release
|
||||
# _BuildArchitecture: 'x64'
|
||||
# _AdditionalBuildParameters: '/p:DisableSourceLink=true /p:DISABLE_CROSSGEN=true'
|
||||
|
||||
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
|
||||
- template: /eng/common/templates/job/publish-build-assets.yml
|
||||
parameters:
|
||||
|
|
@ -362,8 +349,8 @@ stages:
|
|||
publishUsingPipelines: true
|
||||
pool:
|
||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
name: NetCore1ESPool-Svc-Internal
|
||||
demands: ImageOverride -equals Build.Windows.10.Amd64.VS2017
|
||||
name: NetCore1ESPool-Internal
|
||||
demands: ImageOverride -equals Build.Windows.Amd64.VS2022
|
||||
|
||||
|
||||
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
|
||||
|
|
|
|||
|
|
@ -168,12 +168,6 @@
|
|||
<Uri>https://github.com/Microsoft/ApplicationInsights-dotnet</Uri>
|
||||
<Sha>53b80940842204f78708a538628288ff5d741a1d</Sha>
|
||||
</Dependency>
|
||||
<!-- Temporarily pinning Microsoft.Web.Xdt until strict coherency is enabled by default -->
|
||||
<Dependency Name="Microsoft.Web.Xdt" Version="5.0.0-preview.21431.1" CoherentParentDependency="Microsoft.NET.Sdk" Pinned="true">
|
||||
<Uri>https://github.com/dotnet/xdt</Uri>
|
||||
<Sha>698fdad58fa64a55f16cd9562c90224cc498ed02</Sha>
|
||||
<SourceBuildTarball RepoName="xdt" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-8.0.100" Version="8.0.0-alpha.1.22462.1">
|
||||
<Uri>https://github.com/dotnet/emsdk</Uri>
|
||||
<Sha>6736b00d7d23b40b8b6975439421cb2e41a781db</Sha>
|
||||
|
|
@ -199,35 +193,35 @@
|
|||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22465.7">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22466.3">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>cbb2c87350567406c46690ff292e5f6397a5daba</Sha>
|
||||
<Sha>bf47db2617320c82f94713d7b538f7bc0fa9d662</Sha>
|
||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.22465.7">
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.22466.3">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>cbb2c87350567406c46690ff292e5f6397a5daba</Sha>
|
||||
<Sha>bf47db2617320c82f94713d7b538f7bc0fa9d662</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22465.7">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22466.3">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>cbb2c87350567406c46690ff292e5f6397a5daba</Sha>
|
||||
<Sha>bf47db2617320c82f94713d7b538f7bc0fa9d662</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.22462.2">
|
||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||
<Sha>1031000fad67fa8e3f8dc67ef73611b556eb33a5</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="7.0.0-preview.7.22375.6">
|
||||
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="7.0.0-rc.1.22426.10.">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>eecb02807867cad56cd05badddef65e432248b75</Sha>
|
||||
<Sha>06aceb7015f3bd2ff019ef5920d2354eb2ea2c92</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.22465.2">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.22466.2">
|
||||
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
||||
<Sha>3809f7fce2698f3bae454f7e04259e560d1624a0</Sha>
|
||||
<Sha>7024c140e5954ca2d27eb6dc0285b939407ddb42</Sha>
|
||||
<SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22462-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22465-01" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||
<Uri>https://github.com/dotnet/sourcelink</Uri>
|
||||
<Sha>2fc6877be8977fdfdaedbf8dbb1937e85a9c1c0c</Sha>
|
||||
<Sha>16ba25a5b808ab4794d8eeb945a836b32f2efc15</Sha>
|
||||
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22462.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.22465.7</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.22466.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
||||
|
|
@ -110,16 +110,16 @@
|
|||
<!-- Cross-release dependency versions -->
|
||||
<MicrosoftDotNetCommonItemTemplates50PackageVersion>5.0.403</MicrosoftDotNetCommonItemTemplates50PackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplates60PackageVersion>6.0.302</MicrosoftDotNetCommonItemTemplates60PackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplates70PackageVersion>7.0.100-rc.1.22416.16</MicrosoftDotNetCommonItemTemplates70PackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplates70PackageVersion>7.0.100-rc.1.22429.2</MicrosoftDotNetCommonItemTemplates70PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRuntime50PackageVersion>5.0.13</MicrosoftAspNetCoreAppRuntime50PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRuntime60PackageVersion>6.0.1</MicrosoftAspNetCoreAppRuntime60PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRuntime70PackageVersion>7.0.0-rc.1.22423.7</MicrosoftAspNetCoreAppRuntime70PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRuntime70PackageVersion>7.0.0-rc.1.22427.2</MicrosoftAspNetCoreAppRuntime70PackageVersion>
|
||||
<MicrosoftWinFormsProjectTemplates50PackageVersion>5.0.17-servicing.22215.4</MicrosoftWinFormsProjectTemplates50PackageVersion>
|
||||
<MicrosoftWPFProjectTemplates50PackageVersion>5.0.17-servicing.22218.2</MicrosoftWPFProjectTemplates50PackageVersion>
|
||||
<MicrosoftWinFormsProjectTemplates60PackageVersion>6.0.7-servicing.22322.3</MicrosoftWinFormsProjectTemplates60PackageVersion>
|
||||
<MicrosoftWPFProjectTemplates60PackageVersion>6.0.7-servicing.22322.2</MicrosoftWPFProjectTemplates60PackageVersion>
|
||||
<MicrosoftWinFormsProjectTemplates70PackageVersion>7.0.0-rc.1.22362.6</MicrosoftWinFormsProjectTemplates70PackageVersion>
|
||||
<MicrosoftWPFProjectTemplates70PackageVersion>7.0.0-preview.7.22377.1</MicrosoftWPFProjectTemplates70PackageVersion>
|
||||
<MicrosoftWinFormsProjectTemplates70PackageVersion>7.0.0-rc.1.22426.4</MicrosoftWinFormsProjectTemplates70PackageVersion>
|
||||
<MicrosoftWPFProjectTemplates70PackageVersion>7.0.0-rc.1.22427.1</MicrosoftWPFProjectTemplates70PackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<HostFxrVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</HostFxrVersion>
|
||||
|
|
@ -137,12 +137,12 @@
|
|||
<MicrosoftDotNetCommonProjectTemplates80PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonProjectTemplates80PackageVersion>
|
||||
<AspNetCorePackageVersionFor80Templates>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCorePackageVersionFor80Templates>
|
||||
<!-- 7.0 Template versions -->
|
||||
<MicrosoftDotnetWinFormsProjectTemplates70PackageVersion>7.0.0-preview.7.22376.2</MicrosoftDotnetWinFormsProjectTemplates70PackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplates70PackageVersion>7.0.0-preview.7.22377.1</MicrosoftDotNetWpfProjectTemplates70PackageVersion>
|
||||
<MicrosoftDotnetWinFormsProjectTemplates70PackageVersion>7.0.0-rc.1.22426.4</MicrosoftDotnetWinFormsProjectTemplates70PackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplates70PackageVersion>7.0.0-rc.1.22427.1</MicrosoftDotNetWpfProjectTemplates70PackageVersion>
|
||||
<NUnit3Templates70PackageVersion>$(NUnit3DotNetNewTemplatePackageVersion)</NUnit3Templates70PackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplates70PackageVersion>7.0.100-rc.1.22431.7</MicrosoftDotNetCommonItemTemplates70PackageVersion>
|
||||
<MicrosoftDotNetCommonProjectTemplates70PackageVersion>7.0.100-rc.1.22431.7</MicrosoftDotNetCommonProjectTemplates70PackageVersion>
|
||||
<AspNetCorePackageVersionFor70Templates>7.0.0-rc.1.22423.7</AspNetCorePackageVersionFor70Templates>
|
||||
<MicrosoftDotNetCommonItemTemplates70PackageVersion>7.0.100-rc.1.22429.2</MicrosoftDotNetCommonItemTemplates70PackageVersion>
|
||||
<MicrosoftDotNetCommonProjectTemplates70PackageVersion>7.0.100-rc.1.22429.2</MicrosoftDotNetCommonProjectTemplates70PackageVersion>
|
||||
<AspNetCorePackageVersionFor70Templates>7.0.0-rc.1.22427.2</AspNetCorePackageVersionFor70Templates>
|
||||
<!-- 6.0 Template versions -->
|
||||
<MicrosoftDotnetWinFormsProjectTemplates60PackageVersion>$(MicrosoftWinFormsProjectTemplates60PackageVersion)</MicrosoftDotnetWinFormsProjectTemplates60PackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplates60PackageVersion>$(MicrosoftWPFProjectTemplates60PackageVersion)</MicrosoftDotNetWpfProjectTemplates60PackageVersion>
|
||||
|
|
@ -186,7 +186,7 @@
|
|||
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
|
||||
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220915-01</MicrosoftNETTestSdkVersion>
|
||||
<MicrosoftExtensionsLoggingConsoleVersion>7.0.0-preview.7.22375.6</MicrosoftExtensionsLoggingConsoleVersion>
|
||||
<MicrosoftExtensionsLoggingConsoleVersion>7.0.0-rc.1.22426.10.</MicrosoftExtensionsLoggingConsoleVersion>
|
||||
</PropertyGroup>
|
||||
<!-- dependencies for source-build tarball -->
|
||||
<PropertyGroup>
|
||||
|
|
@ -209,7 +209,6 @@
|
|||
necessary, and this property is removed from the file.
|
||||
-->
|
||||
<PrivateSourceBuiltArtifactsPackageVersion>7.0.100-rc.1</PrivateSourceBuiltArtifactsPackageVersion>
|
||||
<PrivateSourceBuiltPrebuiltsPackageVersion>0.1.0-7.0.100-9</PrivateSourceBuiltPrebuiltsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<!-- Workload manifest package versions -->
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -3,15 +3,15 @@
|
|||
"dotnet": "8.0.100-alpha.1.22423.9",
|
||||
"runtimes": {
|
||||
"dotnet": [
|
||||
"7.0.0-preview.7.22375.6"
|
||||
"7.0.0-rc.1.22426.10"
|
||||
]
|
||||
}
|
||||
},
|
||||
"native-tools": {
|
||||
"cmake": "3.16.4"
|
||||
"cmake": "3.21.0"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22465.7",
|
||||
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22465.7"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22466.3",
|
||||
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22466.3"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,10 @@
|
|||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
|
||||
|
||||
<PropertyGroup>
|
||||
<BuildCommand>$(ProjectDirectory)build$(ShellExtension) $(StandardSourceBuildArgs)</BuildCommand>
|
||||
<BuildCommandArgs/>
|
||||
<!-- llvm-project always builds x64 unless told otherwisse -->
|
||||
<BuildCommandArgs>$(BuildCommandArgs) /p:OutputRid=$(PortableRid)</BuildCommandArgs>
|
||||
<BuildCommand>$(ProjectDirectory)build$(ShellExtension) $(StandardSourceBuildArgs) $(BuildCommandArgs)</BuildCommand>
|
||||
|
||||
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
|
||||
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
|
||||
|
|
|
|||
|
|
@ -32,6 +32,10 @@
|
|||
need to support VS.
|
||||
-->
|
||||
<ExtraPackageVersionPropsPackageInfo Include="SourceGeneratorMicrosoftCodeAnalysisVersion" Version="%24(MicrosoftCodeAnalysisCommonVersion)" />
|
||||
<ExtraPackageVersionPropsPackageInfo Include="SourceBuildLiftedSystemCollectionsImmutableVersion" Version="%24(SystemCollectionsImmutableVersion)" />
|
||||
<ExtraPackageVersionPropsPackageInfo Include="SourceBuildLiftedSystemReflectionMetadataVersion" Version="%24(SystemReflectionMetadataVersion)" />
|
||||
<ExtraPackageVersionPropsPackageInfo Include="SourceBuildLiftedSystemRuntimeCompilerServicesUnsafeVersion" Version="%24(SystemRuntimeCompilerServicesUnsafeVersion)" />
|
||||
<ExtraPackageVersionPropsPackageInfo Include="SourceBuildLiftedSystemTextEncodingCodePagesVersion" Version="%24(SystemTextEncodingCodePagesVersion)" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,37 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Rummel <crummel@microsoft.com>
|
||||
Date: Thu, 15 Sep 2022 14:46:53 -0500
|
||||
Subject: [PATCH] Use the source-built version of ref packs and don't use app
|
||||
host when building in source-build.
|
||||
|
||||
Backport PR: https://github.com/dotnet/roslyn/pull/64055.
|
||||
|
||||
---
|
||||
Directory.Build.targets | 15 +++++++++++++++
|
||||
1 file changed, 15 insertions(+)
|
||||
|
||||
diff --git a/Directory.Build.targets b/Directory.Build.targets
|
||||
index 8f38a48cd95..dfb4fd33c9a 100644
|
||||
--- a/Directory.Build.targets
|
||||
+++ b/Directory.Build.targets
|
||||
@@ -1,5 +1,20 @@
|
||||
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
|
||||
<Project>
|
||||
+ <!-- use the source-built version of the reference packs if building in source-build -->
|
||||
+ <ItemGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
|
||||
+ <KnownFrameworkReference Update="Microsoft.NETCore.App">
|
||||
+ <TargetingPackVersion Condition="'%(TargetFramework)' == 'net6.0'">6.0.0</TargetingPackVersion>
|
||||
+ </KnownFrameworkReference>
|
||||
+ <KnownFrameworkReference Update="Microsoft.AspNetCore.App">
|
||||
+ <TargetingPackVersion Condition="'%(TargetFramework)' == 'net6.0'">6.0.0</TargetingPackVersion>
|
||||
+ </KnownFrameworkReference>
|
||||
+ </ItemGroup>
|
||||
+
|
||||
+ <!-- do not restore or use the 6.0 app host in source-build -->
|
||||
+ <PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
|
||||
+ <UseAppHost>false</UseAppHost>
|
||||
+ </PropertyGroup>
|
||||
+
|
||||
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
|
||||
<Import Project="eng\targets\Imports.targets" />
|
||||
</Project>
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Logan Bussell <36081148+lbussell@users.noreply.github.com>
|
||||
Date: Thu, 21 Oct 2021 23:15:23 +0000
|
||||
Subject: [PATCH 1/2] lift version of Microsoft.CodeAnalysis.Common
|
||||
dependencies to previously source built versions
|
||||
|
||||
Requires https://github.com/dotnet/source-build/issues/2482 in order to eliminate this patch
|
||||
---
|
||||
.../Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj
|
||||
index 7eae8afa275..a50822a6aeb 100644
|
||||
--- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj
|
||||
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj
|
||||
@@ -27,5 +27,9 @@
|
||||
<Compile Include="..\..\..\..\..\Compilers\CSharp\Portable\Syntax\SyntaxKindFacts.cs" Link="Grammar\SyntaxKindFacts.cs" Condition="'$(TargetFramework)' != 'netstandard2.0'" />
|
||||
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(SourceGeneratorMicrosoftCodeAnalysisVersion)" PrivateAssets="all" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
|
||||
+ <PackageReference Include="System.Collections.Immutable" Version="$(SourceBuildLiftedSystemCollectionsImmutableVersion)" PrivateAssets="all" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
|
||||
+ <PackageReference Include="System.Reflection.Metadata" Version="$(SourceBuildLiftedSystemReflectionMetadataVersion)" PrivateAssets="all" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
|
||||
+ <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SourceBuildLiftedSystemRuntimeCompilerServicesUnsafeVersion)" PrivateAssets="all" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
|
||||
+ <PackageReference Include="System.Text.Encoding.CodePages" Version="$(SourceBuildLiftedSystemTextEncodingCodePagesVersion)" PrivateAssets="all" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Logan Bussell <loganbussell@microsoft.com>
|
||||
Date: Thu, 14 Jul 2022 14:53:35 -0700
|
||||
Subject: [PATCH 3/5] Fully qualify conflicting runtime and roslyn APIs
|
||||
|
||||
---
|
||||
.../System.Private.CoreLib/gen/EventSourceGenerator.Parser.cs | 2 +-
|
||||
.../System.Text.RegularExpressions/gen/RegexGenerator.Parser.cs | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/libraries/System.Private.CoreLib/gen/EventSourceGenerator.Parser.cs b/src/libraries/System.Private.CoreLib/gen/EventSourceGenerator.Parser.cs
|
||||
index 43a498b589a..1bad8f3753c 100644
|
||||
--- a/src/libraries/System.Private.CoreLib/gen/EventSourceGenerator.Parser.cs
|
||||
+++ b/src/libraries/System.Private.CoreLib/gen/EventSourceGenerator.Parser.cs
|
||||
@@ -15,7 +15,7 @@ namespace Generators
|
||||
{
|
||||
public partial class EventSourceGenerator
|
||||
{
|
||||
- private static EventSourceClass? GetSemanticTargetForGeneration(GeneratorAttributeSyntaxContext context, CancellationToken cancellationToken)
|
||||
+ private static EventSourceClass? GetSemanticTargetForGeneration(Microsoft.CodeAnalysis.DotnetRuntime.Extensions.GeneratorAttributeSyntaxContext context, CancellationToken cancellationToken)
|
||||
{
|
||||
const string EventSourceAttribute = "System.Diagnostics.Tracing.EventSourceAttribute";
|
||||
|
||||
diff --git a/src/libraries/System.Text.RegularExpressions/gen/RegexGenerator.Parser.cs b/src/libraries/System.Text.RegularExpressions/gen/RegexGenerator.Parser.cs
|
||||
index 7a472a994c9..36dc7500bea 100644
|
||||
--- a/src/libraries/System.Text.RegularExpressions/gen/RegexGenerator.Parser.cs
|
||||
+++ b/src/libraries/System.Text.RegularExpressions/gen/RegexGenerator.Parser.cs
|
||||
@@ -20,7 +20,7 @@ public partial class RegexGenerator
|
||||
|
||||
// Returns null if nothing to do, Diagnostic if there's an error to report, or RegexType if the type was analyzed successfully.
|
||||
private static object? GetSemanticTargetForGeneration(
|
||||
- GeneratorAttributeSyntaxContext context, CancellationToken cancellationToken)
|
||||
+ Microsoft.CodeAnalysis.DotnetRuntime.Extensions.GeneratorAttributeSyntaxContext context, CancellationToken cancellationToken)
|
||||
{
|
||||
var methodSyntax = (MethodDeclarationSyntax)context.TargetNode;
|
||||
SemanticModel sm = context.SemanticModel;
|
||||
|
|
@ -1,65 +0,0 @@
|
|||
From 01e9fdd1449324e547230530aea2532488e0b0ce Mon Sep 17 00:00:00 2001
|
||||
From: Logan Bussell <loganbussell@microsoft.com>
|
||||
Date: Mon, 12 Sep 2022 09:50:31 -0700
|
||||
Subject: [PATCH] [release/7.0] Target only net7.0 during source-build (#75168)
|
||||
|
||||
* Target net7.0 in additional projects
|
||||
|
||||
Backport: https://github.com/dotnet/runtime/pull/75168
|
||||
---
|
||||
Directory.Build.props | 1 +
|
||||
eng/SourceBuild.props | 1 +
|
||||
.../src/System.Diagnostics.DiagnosticSource.csproj | 2 --
|
||||
.../tools/GenerateRegexCasingTable.csproj | 2 +-
|
||||
4 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/Directory.Build.props b/Directory.Build.props
|
||||
index 60a661e66ca44..ce67527ff8ed1 100644
|
||||
--- a/Directory.Build.props
|
||||
+++ b/Directory.Build.props
|
||||
@@ -54,6 +54,7 @@
|
||||
<NetCoreAppCurrentBrandName>.NET $(NetCoreAppCurrentVersion)</NetCoreAppCurrentBrandName>
|
||||
<NetCoreAppCurrent>net$(NetCoreAppCurrentVersion)</NetCoreAppCurrent>
|
||||
<NetCoreAppMinimum>net6.0</NetCoreAppMinimum>
|
||||
+ <NetCoreAppMinimum Condition="'$(DotNetBuildFromSource)' == 'true'">$(NetCoreAppCurrent)</NetCoreAppMinimum>
|
||||
|
||||
<NetCoreAppToolCurrentVersion>7.0</NetCoreAppToolCurrentVersion>
|
||||
<NetCoreAppToolCurrent>net$(NetCoreAppToolCurrentVersion)</NetCoreAppToolCurrent>
|
||||
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
|
||||
index c17838918f8ce..9ca390c502f75 100644
|
||||
--- a/eng/SourceBuild.props
|
||||
+++ b/eng/SourceBuild.props
|
||||
@@ -39,6 +39,7 @@
|
||||
<InnerBuildArgs Condition="'$(ContinuousIntegrationBuild)' != ''">$(InnerBuildArgs) /p:ContinuousIntegrationBuild=$(ContinuousIntegrationBuild)</InnerBuildArgs>
|
||||
<InnerBuildArgs>$(InnerBuildArgs) /p:BuildDebPackage=false</InnerBuildArgs>
|
||||
<InnerBuildArgs>$(InnerBuildArgs) /p:EnableNgenOptimization=false</InnerBuildArgs>
|
||||
+ <InnerBuildArgs>$(InnerBuildArgs) /p:EnablePackageValidation=false</InnerBuildArgs>
|
||||
</PropertyGroup>
|
||||
</Target>
|
||||
|
||||
diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj
|
||||
index 9c22bce30dae9..6d40be2f856b7 100644
|
||||
--- a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj
|
||||
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj
|
||||
@@ -6,8 +6,6 @@
|
||||
<NoWarn>$(NoWarn);SA1205;CA1845</NoWarn>
|
||||
<EnableTrimAnalyzer Condition="$([MSBuild]::GetTargetFrameworkIdentifier('$(TargetFramework)')) == '.NETFramework'">false</EnableTrimAnalyzer>
|
||||
<IsPackable>true</IsPackable>
|
||||
- <!-- Lifetime rules introduced in C# 11 impact scenarios in net6 framework -->
|
||||
- <LangVersion Condition="'$(TargetFramework)' == 'net6.0'">10</LangVersion>
|
||||
<EnableAOTAnalyzer>true</EnableAOTAnalyzer>
|
||||
<PackageDescription>Provides Classes that allow you to decouple code logging rich (unserializable) diagnostics/telemetry (e.g. framework) from code that consumes it (e.g. tools)
|
||||
|
||||
diff --git a/src/libraries/System.Text.RegularExpressions/tools/GenerateRegexCasingTable.csproj b/src/libraries/System.Text.RegularExpressions/tools/GenerateRegexCasingTable.csproj
|
||||
index 26b5733684c3f..4df9075220402 100644
|
||||
--- a/src/libraries/System.Text.RegularExpressions/tools/GenerateRegexCasingTable.csproj
|
||||
+++ b/src/libraries/System.Text.RegularExpressions/tools/GenerateRegexCasingTable.csproj
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
- <TargetFramework>net6.0</TargetFramework>
|
||||
+ <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
|
||||
<LangVersion>latest</LangVersion>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
|
|
@ -12,7 +12,7 @@ diff --git a/Directory.Build.props b/Directory.Build.props
|
|||
index 1353696a29..4e7463a453 100644
|
||||
--- a/Directory.Build.props
|
||||
+++ b/Directory.Build.props
|
||||
@@ -13,9 +13,11 @@
|
||||
@@ -14,9 +14,11 @@
|
||||
<SdkTargetFramework>net7.0</SdkTargetFramework>
|
||||
<ToolsetTargetFramework>$(SdkTargetFramework)</ToolsetTargetFramework>
|
||||
|
||||
|
|
|
|||
|
|
@ -11,10 +11,10 @@ Subject: [PATCH] Change TargetFramework to net7.0
|
|||
.../Microsoft.DotNet.PackageValidation.csproj | 2 +-
|
||||
.../Microsoft.Extensions.DotNetDeltaApplier.csproj | 2 +-
|
||||
.../Microsoft.DotNet.Cli.Utils.csproj | 2 +-
|
||||
7 files changed, 7 insertions(+), 7 deletions(-)
|
||||
8 files changed, 13 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj
|
||||
index 8177095a90..0c1f7acebf 100644
|
||||
index e56cd66fa1..0330085999 100644
|
||||
--- a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj
|
||||
+++ b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj
|
||||
@@ -1,7 +1,7 @@
|
||||
|
|
@ -40,7 +40,7 @@ index fb49a12fb4..2ce737c75d 100644
|
|||
<!-- TODO: Remove when the consumers of this package upgraded to a newer SDK with this change. -->
|
||||
<UseCompatibilityPackage>true</UseCompatibilityPackage>
|
||||
diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj
|
||||
index 2de17ce715..32e6580920 100644
|
||||
index 4d148d1360..8e2f52a7ac 100644
|
||||
--- a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj
|
||||
+++ b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj
|
||||
@@ -1,7 +1,7 @@
|
||||
|
|
@ -53,7 +53,7 @@ index 2de17ce715..32e6580920 100644
|
|||
<Nullable>enable</Nullable>
|
||||
<IsPackable>true</IsPackable>
|
||||
diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj
|
||||
index 7b8569a72b..b1e1e4d53e 100644
|
||||
index 4ee0173f24..c72ac850d1 100644
|
||||
--- a/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj
|
||||
+++ b/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj
|
||||
@@ -1,7 +1,7 @@
|
||||
|
|
@ -92,7 +92,7 @@ index 40927ae1f2..3c2236e38d 100644
|
|||
|
||||
<IsPackable>false</IsPackable>
|
||||
diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
|
||||
index 006f56939d..ddcfe2e362 100644
|
||||
index 03ea923734..3246138cf9 100644
|
||||
--- a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
|
||||
+++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
|
||||
@@ -22,7 +22,7 @@
|
||||
|
|
|
|||
|
|
@ -77,12 +77,12 @@
|
|||
<_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</_NETCorePlatformsPackageVersion>
|
||||
|
||||
<!-- TODO: Once .NET 7.0 has released, update these version numbers to 7.0.0 -->
|
||||
<_NET70RuntimePackVersion>7.0.0-rc.1.22423.16</_NET70RuntimePackVersion>
|
||||
<_NET70TargetingPackVersion>7.0.0-rc.1.22423.16</_NET70TargetingPackVersion>
|
||||
<_WindowsDesktop70RuntimePackVersion>7.0.0-rc.1.22423.6</_WindowsDesktop70RuntimePackVersion>
|
||||
<_WindowsDesktop70TargetingPackVersion>7.0.0-rc.1.22423.6</_WindowsDesktop70TargetingPackVersion>
|
||||
<_AspNet70RuntimePackVersion>7.0.0-rc.1.22423.7</_AspNet70RuntimePackVersion>
|
||||
<_AspNet70TargetingPackVersion>7.0.0-rc.1.22423.7</_AspNet70TargetingPackVersion>
|
||||
<_NET70RuntimePackVersion>7.0.0-rc.1.22426.10</_NET70RuntimePackVersion>
|
||||
<_NET70TargetingPackVersion>7.0.0-rc.1.22426.10</_NET70TargetingPackVersion>
|
||||
<_WindowsDesktop70RuntimePackVersion>7.0.0-rc.1.22427.1</_WindowsDesktop70RuntimePackVersion>
|
||||
<_WindowsDesktop70TargetingPackVersion>7.0.0-rc.1.22427.1</_WindowsDesktop70TargetingPackVersion>
|
||||
<_AspNet70RuntimePackVersion>7.0.0-rc.1.22427.2</_AspNet70RuntimePackVersion>
|
||||
<_AspNet70TargetingPackVersion>7.0.0-rc.1.22427.2</_AspNet70TargetingPackVersion>
|
||||
|
||||
<_NET60RuntimePackVersion>6.0.$(VersionFeature60)</_NET60RuntimePackVersion>
|
||||
<_NET60TargetingPackVersion>6.0.$(VersionFeature60)</_NET60TargetingPackVersion>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<ul>
|
||||
<li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
|
||||
<li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
|
||||
<li><a href="https://aka.ms/dotnet6-release-notes">Release Notes</a></li>
|
||||
<li><a href="https://aka.ms/dotnet7-release-notes">Release Notes</a></li>
|
||||
<li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<ul>
|
||||
<li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
|
||||
<li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
|
||||
<li><a href="https://aka.ms/dotnet6-release-notes">Release Notes</a></li>
|
||||
<li><a href="https://aka.ms/dotnet7-release-notes">Release Notes</a></li>
|
||||
<li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<ul>
|
||||
<li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
|
||||
<li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
|
||||
<li><a href="https://aka.ms/dotnet6-release-notes">Release Notes</a></li>
|
||||
<li><a href="https://aka.ms/dotnet7-release-notes">Release Notes</a></li>
|
||||
<li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<ul>
|
||||
<li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
|
||||
<li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
|
||||
<li><a href="https://aka.ms/dotnet6-release-notes">Release Notes</a></li>
|
||||
<li><a href="https://aka.ms/dotnet7-release-notes">Release Notes</a></li>
|
||||
<li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<ul>
|
||||
<li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
|
||||
<li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
|
||||
<li><a href="https://aka.ms/dotnet6-release-notes">Release Notes</a></li>
|
||||
<li><a href="https://aka.ms/dotnet7-release-notes">Release Notes</a></li>
|
||||
<li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<ul>
|
||||
<li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
|
||||
<li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
|
||||
<li><a href="https://aka.ms/dotnet6-release-notes">Release Notes</a></li>
|
||||
<li><a href="https://aka.ms/dotnet7-release-notes">Release Notes</a></li>
|
||||
<li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<ul>
|
||||
<li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
|
||||
<li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
|
||||
<li><a href="https://aka.ms/dotnet6-release-notes">Release Notes</a></li>
|
||||
<li><a href="https://aka.ms/dotnet7-release-notes">Release Notes</a></li>
|
||||
<li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<ul>
|
||||
<li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
|
||||
<li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
|
||||
<li><a href="https://aka.ms/dotnet6-release-notes">Release Notes</a></li>
|
||||
<li><a href="https://aka.ms/dotnet7-release-notes">Release Notes</a></li>
|
||||
<li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<ul>
|
||||
<li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
|
||||
<li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
|
||||
<li><a href="https://aka.ms/dotnet6-release-notes">Release Notes</a></li>
|
||||
<li><a href="https://aka.ms/dotnet7-release-notes">Release Notes</a></li>
|
||||
<li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<ul>
|
||||
<li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
|
||||
<li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
|
||||
<li><a href="https://aka.ms/dotnet6-release-notes">Release Notes</a></li>
|
||||
<li><a href="https://aka.ms/dotnet7-release-notes">Release Notes</a></li>
|
||||
<li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<ul>
|
||||
<li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
|
||||
<li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
|
||||
<li><a href="https://aka.ms/dotnet6-release-notes">Release Notes</a></li>
|
||||
<li><a href="https://aka.ms/dotnet7-release-notes">Release Notes</a></li>
|
||||
<li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<ul>
|
||||
<li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
|
||||
<li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
|
||||
<li><a href="https://aka.ms/dotnet6-release-notes">Release Notes</a></li>
|
||||
<li><a href="https://aka.ms/dotnet7-release-notes">Release Notes</a></li>
|
||||
<li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<ul>
|
||||
<li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
|
||||
<li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
|
||||
<li><a href="https://aka.ms/dotnet6-release-notes">Release Notes</a></li>
|
||||
<li><a href="https://aka.ms/dotnet7-release-notes">Release Notes</a></li>
|
||||
<li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<ul>
|
||||
<li><a href="https://aka.ms/dotnet-docs">.NET Documentation</a></li>
|
||||
<li><a href="https://aka.ms/dotnet-cli-docs">SDK Documentation</a></li>
|
||||
<li><a href="https://aka.ms/dotnet6-release-notes">Release Notes</a></li>
|
||||
<li><a href="https://aka.ms/dotnet7-release-notes">Release Notes</a></li>
|
||||
<li><a href="https://aka.ms/dotnet-tutorials">Tutorials</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@
|
|||
<String Id="InstallationNoteTitle">安裝附註</String>
|
||||
<String Id="InstallationNote">安裝程序期間將會執行命令，加快專案還原速度並啟用離線存取。最多需要一分鐘的時間完成。
|
||||
</String>
|
||||
<String Id="VisualStudioWarning">若預計要搭配 Visual Studio 使用 .NET 7.0，需要 Visual Studio 2022 17.0 或更新版本。<A HREF="https://aka.ms/dotnet7-release-notes">深入了解</A>.
|
||||
<String Id="VisualStudioWarning">若預計要搭配 Visual Studio 使用 .NET 7.0，需要 Visual Studio 2022 17.4 或更新版本。<A HREF="https://aka.ms/dotnet7-release-notes">深入了解</A>.
|
||||
</String>
|
||||
<String Id="LicenseAssent">按一下 [\[]安裝[\[] 即表示您同意下列條款。</String>
|
||||
<String Id="InstallPathx64x86">The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ Zdroje informací
|
|||
<String Id="InstallationNoteTitle">Poznámka k instalaci</String>
|
||||
<String Id="InstallationNote">Během procesu instalace se spustí příkaz, který zlepší rychlost obnovení projektu a povolí offline přístup. Akce se dokončí přibližně za minutu.
|
||||
</String>
|
||||
<String Id="VisualStudioWarning">Pokud se chystáte používat .NET 7.0 se sadou Visual Studio, potřebujete Visual Studio 2022 17.0 nebo novější. <A HREF="https://aka.ms/dotnet7-release-notes">Další informace</A>.
|
||||
<String Id="VisualStudioWarning">Pokud se chystáte používat .NET 7.0 se sadou Visual Studio, potřebujete Visual Studio 2022 17.4 nebo novější. <A HREF="https://aka.ms/dotnet7-release-notes">Další informace</A>.
|
||||
</String>
|
||||
<String Id="LicenseAssent">Kliknutím na Nainstalovat vyjadřujete souhlas s následujícími podmínkami.</String>
|
||||
<String Id="InstallPathx64x86">The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ Ressourcen
|
|||
<String Id="InstallationNoteTitle">Installationshinweis</String>
|
||||
<String Id="InstallationNote">Während des Installationsvorgangs wird ein Befehl ausgeführt, durch den die Geschwindigkeit der Projektwiederherstellung verbessert und der Offlinezugriff aktiviert wird. Der Vorgang dauert bis zu einer Minute.
|
||||
</String>
|
||||
<String Id="VisualStudioWarning">Wenn Sie .NET 7.0 mit Visual Studio verwenden möchten, ist Visual Studio 2022 17.0 oder höher erforderlich. <A HREF="https://aka.ms/dotnet7-release-notes">Weitere Informationen</A>
|
||||
<String Id="VisualStudioWarning">Wenn Sie .NET 7.0 mit Visual Studio verwenden möchten, ist Visual Studio 2022 17.4 oder höher erforderlich. <A HREF="https://aka.ms/dotnet7-release-notes">Weitere Informationen</A>
|
||||
</String>
|
||||
<String Id="LicenseAssent">Durch Klicken auf "Installieren" stimmen Sie den nachstehenden Bedingungen zu.</String>
|
||||
<String Id="InstallPathx64x86">The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ Resources
|
|||
<String Id="InstallationNoteTitle">Installation note</String>
|
||||
<String Id="InstallationNote">A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.
|
||||
</String>
|
||||
<String Id="VisualStudioWarning">If you plan to use .NET 7.0 with Visual Studio, Visual Studio 2022 17.0 or newer is required. <A HREF="https://aka.ms/dotnet7-release-notes">Learn more</A>.
|
||||
<String Id="VisualStudioWarning">If you plan to use .NET 7.0 with Visual Studio, Visual Studio 2022 17.4 or newer is required. <A HREF="https://aka.ms/dotnet7-release-notes">Learn more</A>.
|
||||
</String>
|
||||
<String Id="LicenseAssent">By clicking Install, you agree to the following terms:</String>
|
||||
<String Id="InstallPathx64x86">The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ Ressources
|
|||
<String Id="InstallationNoteTitle">Note d'installation</String>
|
||||
<String Id="InstallationNote">Une commande va être exécutée pendant le processus d'installation, ce qui va améliorer la vitesse de restauration du projet et permettre l'accès hors connexion. L'opération va prendre environ une minute.
|
||||
</String>
|
||||
<String Id="VisualStudioWarning">Si vous comptez utiliser .NET 7.0 avec Visual Studio, Visual Studio 2022 17.0 ou une version ultérieure est nécessaire. <A HREF="https://aka.ms/dotnet7-release-notes">En savoir plus</A>.
|
||||
<String Id="VisualStudioWarning">Si vous comptez utiliser .NET 7.0 avec Visual Studio, Visual Studio 2022 17.4 ou une version ultérieure est nécessaire. <A HREF="https://aka.ms/dotnet7-release-notes">En savoir plus</A>.
|
||||
</String>
|
||||
<String Id="LicenseAssent">En cliquant sur Installer, vous acceptez les conditions suivantes.</String>
|
||||
<String Id="InstallPathx64x86">The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ Risorse
|
|||
<String Id="InstallationNoteTitle">Nota sull'installazione</String>
|
||||
<String Id="InstallationNote">Durante il processo di installazione verrà eseguito un comando che migliorerà la velocità di ripristino del progetto e abiliterà l'accesso offline. Il completamento del comando richiederà un minuto.
|
||||
</String>
|
||||
<String Id="VisualStudioWarning">Se si intende usare .NET 7.0 con Visual Studio, è richiesto Visual Studio 2022 17.0 o versione successiva. <A HREF="https://aka.ms/dotnet7-release-notes">Altre informazioni</A>.
|
||||
<String Id="VisualStudioWarning">Se si intende usare .NET 7.0 con Visual Studio, è richiesto Visual Studio 2022 17.4 o versione successiva. <A HREF="https://aka.ms/dotnet7-release-notes">Altre informazioni</A>.
|
||||
</String>
|
||||
<String Id="LicenseAssent">Facendo clic su Installa, si accettano le condizioni seguenti.</String>
|
||||
<String Id="InstallPathx64x86">The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@
|
|||
<String Id="InstallationNoteTitle">インストール メモ</String>
|
||||
<String Id="InstallationNote">コマンドはインストール処理中に実行されるので、プロジェクトの復元速度が向上し、オフラインでアクセスできます。完了するまでに最大 1 分かかります。
|
||||
</String>
|
||||
<String Id="VisualStudioWarning">.NET 7.0 を Visual Studio で使用する場合は、Visual Studio 2022 17.0 以降が必要です。<A HREF="https://aka.ms/dotnet7-release-notes">詳細情報</A>。
|
||||
<String Id="VisualStudioWarning">.NET 7.0 を Visual Studio で使用する場合は、Visual Studio 2022 17.4 以降が必要です。<A HREF="https://aka.ms/dotnet7-release-notes">詳細情報</A>。
|
||||
</String>
|
||||
<String Id="LicenseAssent">[インストール] をクリックすると、次の条項に同意したものと見なされます。</String>
|
||||
<String Id="InstallPathx64x86">The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@
|
|||
<String Id="InstallationNoteTitle">설치 정보</String>
|
||||
<String Id="InstallationNote">프로젝트 복원 속도를 향상하고 오프라인 액세스를 사용할 수 있도록 하는 설치 프로세스 중 명령이 실행됩니다. 완료하는 데 최대 1분이 걸립니다.
|
||||
</String>
|
||||
<String Id="VisualStudioWarning">Visual Studio와 함께 .NET 7.0을 사용하려면 Visual Studio 2022 17.0 이상이 필요합니다. <A HREF="https://aka.ms/dotnet7-release-notes">자세한 정보</A>.
|
||||
<String Id="VisualStudioWarning">Visual Studio와 함께 .NET 7.0을 사용하려면 Visual Studio 2022 17.4 이상이 필요합니다. <A HREF="https://aka.ms/dotnet7-release-notes">자세한 정보</A>.
|
||||
</String>
|
||||
<String Id="LicenseAssent">[설치]를 클릭하면 다음 사용 약관에 동의하는 것입니다.</String>
|
||||
<String Id="InstallPathx64x86">The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ Zasoby
|
|||
<String Id="InstallationNoteTitle">Uwaga dotycząca instalacji</String>
|
||||
<String Id="InstallationNote">W trakcie procesu instalacji zostanie uruchomione polecenie, które zwiększy szybkość przywracania projektu i umożliwi dostęp do trybu offline. Zajmie to maksymalnie minutę.
|
||||
</String>
|
||||
<String Id="VisualStudioWarning">Jeśli planujesz używać platformy .NET 7.0 z programem Visual Studio, wymagany jest program Visual Studio 2022 17.0 lub nowszy. <A HREF="https://aka.ms/dotnet7-release-notes">Dowiedz się więcej</A>.
|
||||
<String Id="VisualStudioWarning">Jeśli planujesz używać platformy .NET 7.0 z programem Visual Studio, wymagany jest program Visual Studio 2022 17.4 lub nowszy. <A HREF="https://aka.ms/dotnet7-release-notes">Dowiedz się więcej</A>.
|
||||
</String>
|
||||
<String Id="LicenseAssent">Klikając pozycję Zainstaluj, wyrażasz zgodę na następujące warunki.</String>
|
||||
<String Id="InstallPathx64x86">The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ Recursos
|
|||
<String Id="InstallationNoteTitle">Nota de instalação</String>
|
||||
<String Id="InstallationNote">Um comando será executado durante o processo de instalação que melhorará a velocidade de restauração do projeto e habilitará o acesso offline. Isso levará até um minuto para ser concluído.
|
||||
</String>
|
||||
<String Id="VisualStudioWarning">Se você planeja usar o .NET 7.0 com o Visual Studio, é necessário usar o Visual Studio 2022 17.0 ou mais recente. <A HREF="https://aka.ms/dotnet7-release-notes">Saiba mais</A>.
|
||||
<String Id="VisualStudioWarning">Se você planeja usar o .NET 7.0 com o Visual Studio, é necessário usar o Visual Studio 2022 17.4 ou mais recente. <A HREF="https://aka.ms/dotnet7-release-notes">Saiba mais</A>.
|
||||
</String>
|
||||
<String Id="LicenseAssent">Ao clicar em instalar, você concorda com os termos a seguir.</String>
|
||||
<String Id="InstallPathx64x86">The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@
|
|||
<String Id="InstallationNoteTitle">Примечание по установке</String>
|
||||
<String Id="InstallationNote">В процессе установки будет выполнена команда, которая увеличит скорость восстановления проекта и обеспечит автономный доступ. Выполнение займет до минуты.
|
||||
</String>
|
||||
<String Id="VisualStudioWarning">Если вы планируете использовать .NET 7.0 с Visual Studio, требуется Visual Studio 2022 версии 17.0 или более поздней. <A HREF="https://aka.ms/dotnet7-release-notes">Дополнительные сведения</A>.
|
||||
<String Id="VisualStudioWarning">Если вы планируете использовать .NET 7.0 с Visual Studio, требуется Visual Studio 2022 версии 17.4 или более поздней. <A HREF="https://aka.ms/dotnet7-release-notes">Дополнительные сведения</A>.
|
||||
</String>
|
||||
<String Id="LicenseAssent">Нажимая кнопку "Установить", вы принимаете следующие условия.</String>
|
||||
<String Id="InstallPathx64x86">The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ Kaynaklar
|
|||
<String Id="InstallationNoteTitle">Yükleme notu</String>
|
||||
<String Id="InstallationNote">Yükleme işlemi sırasında, proje geri yükleme hızını artıran ve çevrimdışı erişimi etkinleştiren bir komut çalıştırılır. Tamamlanması bir dakikanızı alır.
|
||||
</String>
|
||||
<String Id="VisualStudioWarning">Visual Studio ile .NET 7.0 kullanmayı planlıyorsanız Visual Studio 2022 17.0 veya üzeri bir sürüm gerekir. <A HREF="https://aka.ms/dotnet7-release-notes">Daha Fazla Bilgi</A>.
|
||||
<String Id="VisualStudioWarning">Visual Studio ile .NET 7.0 kullanmayı planlıyorsanız Visual Studio 2022 17.4 veya üzeri bir sürüm gerekir. <A HREF="https://aka.ms/dotnet7-release-notes">Daha Fazla Bilgi</A>.
|
||||
</String>
|
||||
<String Id="LicenseAssent">Yükle'ye tıklayarak aşağıdaki koşulları kabul etmiş olursunuz.</String>
|
||||
<String Id="InstallPathx64x86">The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@
|
|||
<String Id="InstallationNoteTitle">安装说明</String>
|
||||
<String Id="InstallationNote">将在要提升项目还原速度并实现脱机访问的安装进程期间运行命令。此操作最多 1 分钟即可完成。
|
||||
</String>
|
||||
<String Id="VisualStudioWarning">如果打算结合使用 .NET 7.0 和 Visual Studio，需要 Visual Studio 2022 17.0 或更高版本。<A HREF="https://aka.ms/dotnet7-release-notes">了解详细信息</A>。
|
||||
<String Id="VisualStudioWarning">如果打算结合使用 .NET 7.0 和 Visual Studio，需要 Visual Studio 2022 17.4 或更高版本。<A HREF="https://aka.ms/dotnet7-release-notes">了解详细信息</A>。
|
||||
</String>
|
||||
<String Id="LicenseAssent">单击“安装”即表示你同意以下条款。</String>
|
||||
<String Id="InstallPathx64x86">The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ Recursos
|
|||
<String Id="InstallationNoteTitle">Nota de instalación</String>
|
||||
<String Id="InstallationNote">Se ejecutará un comando durante el proceso de instalación que mejorará la velocidad de restauración del proyecto y permitirá el acceso sin conexión. La operación tardará hasta un minuto en completarse.
|
||||
</String>
|
||||
<String Id="VisualStudioWarning">Si tiene previsto usar .NET 7.0 con Visual Studio, se requiere Visual Studio 2022 17.0 o una versión más reciente. <A HREF="https://aka.ms/dotnet7-release-notes">Obtenga más información</A>.
|
||||
<String Id="VisualStudioWarning">Si tiene previsto usar .NET 7.0 con Visual Studio, se requiere Visual Studio 2022 17.4 o una versión más reciente. <A HREF="https://aka.ms/dotnet7-release-notes">Obtenga más información</A>.
|
||||
</String>
|
||||
<String Id="LicenseAssent">Al hacer clic en Instalar, acepta los términos siguientes.</String>
|
||||
<String Id="InstallPathx64x86">The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]"</String>
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@
|
|||
<RuntimeVersionToInstall Include="3.1.0" />
|
||||
<RuntimeVersionToInstall Include="5.0.0" />
|
||||
<RuntimeVersionToInstall Include="6.0.0" />
|
||||
<RuntimeVersionToInstall Include="7.0.0-rc.1.22423.16" />
|
||||
<RuntimeVersionToInstall Include="7.0.0-rc.1.22426.10" />
|
||||
</ItemGroup>
|
||||
|
||||
</Target>
|
||||
|
|
|
|||
Loading…
Reference in a new issue