Skip to content

Commit 129740c

Browse files
deepchoudheryHaoKdotnet-botmmitche
authored
CPs from main (#1505)
* reverting to 5.0 sdk, 5.0 tfm until 6.0 stablizes (#1492) * added lower case check for package paths (#1493) * Port Identity UI accessibility fixes (#1502) * added Publishing.props to update to V3 publish (#1504) * Fixup feeds (#1498) Co-authored-by: Matt Mitchell <[email protected]> Co-authored-by: Deep Choudhery <[email protected]> Co-authored-by: Hao Kung <[email protected]> Co-authored-by: dotnet bot <[email protected]> Co-authored-by: Matt Mitchell <[email protected]>
1 parent 66d7a79 commit 129740c

51 files changed

Lines changed: 125 additions & 138 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎NuGet.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
<clear />
55
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
66
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
7+
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
8+
<add key="dotnet5-rtm" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/5.0.100-rtm.20526.5/nuget/v3/index.json" />
79
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
810
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
9-
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
1011
</packageSources>
1112
<disabledPackageSources />
1213
</configuration>

‎azure-pipelines.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ stages:
149149
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
150150
- template: eng\common\templates\post-build\post-build.yml
151151
parameters:
152+
publishingInfraVersion: 3
152153
# Symbol validation isn't being very reliable lately. This should be enabled back
153154
# once this issue is resolved: https://github.com/dotnet/arcade/issues/2871
154155
enableSymbolValidation: false

‎eng/Publishing.props‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
<PropertyGroup>
4+
<PublishingVersion>3</PublishingVersion>
5+
</PropertyGroup>
6+
</Project>

‎eng/Versions.props‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,4 +116,9 @@
116116
<XunitExtensibilityExecutionPackageVersion>2.4.1</XunitExtensibilityExecutionPackageVersion>
117117
<XunitRunnerVisualStudioPackageVersion>2.4.1</XunitRunnerVisualStudioPackageVersion>
118118
</PropertyGroup>
119+
120+
<PropertyGroup>
121+
<SystemCollectionsImmutableVersion>6.0.0-preview.1.21102.12</SystemCollectionsImmutableVersion>
122+
<SystemComponentModelAnnotationsVersion>6.0.0-preview.1.21102.12</SystemComponentModelAnnotationsVersion>
123+
</PropertyGroup>
119124
</Project>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "6.0.100-preview.1.21079.2"
3+
"dotnet": "5.0.102"
44
},
55
"msbuild-sdks": {
66
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21105.12"

‎global_install.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
set VERSION=5.0.0
1+
set VERSION=6.0.0-dev
22
set DEFAULT_NUPKG_PATH=%userprofile%/.nuget/packages
33
set SRC_DIR=%cd%
44
set NUPKG=artifacts/packages/Debug/Shipping/

‎src/VS.Web.CG.Contracts/VS.Web.CG.Contracts.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net5.0</TargetFramework>
44
<AssemblyName>Microsoft.VisualStudio.Web.CodeGeneration.Contracts</AssemblyName>
55
<RootNamespace>Microsoft.VisualStudio.Web.CodeGeneration.Contracts</RootNamespace>
66
<Description>Contains interfaces for Project Model and messaging for scaffolding.</Description>

‎src/VS.Web.CG.Core/VS.Web.CG.Core.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Contains the core infrastructure used by ASP.NET Core Code Generators.</Description>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net5.0</TargetFramework>
66
<AssemblyName>Microsoft.VisualStudio.Web.CodeGeneration.Core</AssemblyName>
77
<RootNamespace>Microsoft.VisualStudio.Web.CodeGeneration.Core</RootNamespace>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>

‎src/VS.Web.CG.Design/VS.Web.CG.Design.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<Import Project="Shared.props" />
88
<PropertyGroup>
9-
<TargetFramework>net6.0</TargetFramework>
9+
<TargetFramework>net5.0</TargetFramework>
1010
<PackageTags>aspnetcore;codegenerator;scaffolding;visualstudioweb</PackageTags>
1111
<PackageId>Microsoft.VisualStudio.Web.CodeGeneration.Design</PackageId>
1212
<X86BinDirectory>$(ArtifactsBinDir)VS.Web.CG.Design-x86\</X86BinDirectory>
@@ -32,21 +32,21 @@
3232
$(OutputPath)$(AssemblyName).xml;"
3333
Condition=" '$(DotNetBuildFromSource)' != 'true' ">
3434
<Pack>true</Pack>
35-
<PackagePath>lib\net6.0\</PackagePath>
35+
<PackagePath>lib\net5.0\</PackagePath>
3636
</Content>
3737

38-
<Content Include="$(ARMBinDirectory)$(Configuration)\net6.0\win-arm\$(AssemblyName).exe;
39-
$(ARMBinDirectory)$(Configuration)\net6.0\win-arm\$(AssemblyName).xml;"
38+
<Content Include="$(ARMBinDirectory)$(Configuration)\net5.0\win-arm\$(AssemblyName).exe;
39+
$(ARMBinDirectory)$(Configuration)\net5.0\win-arm\$(AssemblyName).xml;"
4040
Condition=" '$(DotNetBuildFromSource)' != 'true' ">
4141
<Pack>true</Pack>
42-
<PackagePath>runtimes\win-arm\lib\net6.0\</PackagePath>
42+
<PackagePath>runtimes\win-arm\lib\net5.0\</PackagePath>
4343
</Content>
4444

45-
<Content Include="$(ARM64BinDirectory)$(Configuration)\net6.0\win-arm64\$(AssemblyName).exe;
46-
$(ARM64BinDirectory)$(Configuration)\net6.0\win-arm64\$(AssemblyName).xml;"
45+
<Content Include="$(ARM64BinDirectory)$(Configuration)\net5.0\win-arm64\$(AssemblyName).exe;
46+
$(ARM64BinDirectory)$(Configuration)\net5.0\win-arm64\$(AssemblyName).xml;"
4747
Condition=" '$(DotNetBuildFromSource)' != 'true' ">
4848
<Pack>true</Pack>
49-
<PackagePath>runtimes\win-arm64\lib\net6.0\</PackagePath>
49+
<PackagePath>runtimes\win-arm64\lib\net5.0\</PackagePath>
5050
</Content>
5151
</ItemGroup>
5252
</Project>

‎src/VS.Web.CG.EFCore/VS.Web.CG.EFCore.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Contains Entity Framework Core Services used by ASP.NET Core Code Generators.</Description>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net5.0</TargetFramework>
66
<AssemblyName>Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore</AssemblyName>
77
<RootNamespace>Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore</RootNamespace>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>

0 commit comments

Comments
 (0)