Skip to content

Commit 99114c2

Browse files
jbaggajbagga
authored
Adjust spacing in csproj files (#492)
Address #462 and fix build break
1 parent e9fbf4e commit 99114c2

File tree

6 files changed

+36
-36
lines changed

6 files changed

+36
-36
lines changed

‎build/dependencies.props

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,41 +3,41 @@
33
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
44
</PropertyGroup>
55
<PropertyGroup Label="Package Versions">
6-
<DotNetEfPackageVersion>2.1.0-rc1-30677</DotNetEfPackageVersion>
7-
<InternalAspNetCoreSdkPackageVersion>2.1.0-rtm-15776</InternalAspNetCoreSdkPackageVersion>
8-
<MicrosoftAspNetCoreAllPackageVersion>2.1.0-rc1-30677</MicrosoftAspNetCoreAllPackageVersion>
9-
<MicrosoftAspNetCoreAppPackageVersion>2.1.0-rc1-30677</MicrosoftAspNetCoreAppPackageVersion>
10-
<MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion>2.1.0-rc1-30677</MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion>
11-
<MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion>2.1.0-rc1-30677</MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion>
12-
<MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>2.1.0-rc1-30677</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>
13-
<MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion>2.1.0-rc1-30677</MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion>
14-
<MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>2.1.0-rc1-30677</MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>
15-
<MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>2.1.0-rc1-30677</MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>
16-
<MicrosoftAspNetCoreCookiePolicyPackageVersion>2.1.0-rc1-30677</MicrosoftAspNetCoreCookiePolicyPackageVersion>
17-
<MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>2.1.0-rc1-30677</MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>
18-
<MicrosoftAspNetCoreHttpsPolicyPackageVersion>2.1.0-rc1-30677</MicrosoftAspNetCoreHttpsPolicyPackageVersion>
19-
<MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>2.1.0-rc1-30677</MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>
20-
<MicrosoftAspNetCoreIdentityUIPackageVersion>2.1.0-rc1-30677</MicrosoftAspNetCoreIdentityUIPackageVersion>
21-
<MicrosoftAspNetCoreMvcPackageVersion>2.1.0-rc1-30677</MicrosoftAspNetCoreMvcPackageVersion>
22-
<MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion>2.1.0-rc1-30677</MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion>
23-
<MicrosoftAspNetCorePackageVersion>2.1.0-rc1-30677</MicrosoftAspNetCorePackageVersion>
24-
<MicrosoftAspNetCoreSpaServicesExtensionsPackageVersion>2.1.0-rc1-30677</MicrosoftAspNetCoreSpaServicesExtensionsPackageVersion>
25-
<MicrosoftAspNetCoreSpaServicesPackageVersion>2.1.0-rc1-30677</MicrosoftAspNetCoreSpaServicesPackageVersion>
26-
<MicrosoftAspNetCoreStaticFilesPackageVersion>2.1.0-rc1-30677</MicrosoftAspNetCoreStaticFilesPackageVersion>
27-
<MicrosoftAspNetCoreTestingPackageVersion>2.1.0-rc1-30677</MicrosoftAspNetCoreTestingPackageVersion>
6+
<DotNetEfPackageVersion>2.1.0-rtm-30700</DotNetEfPackageVersion>
7+
<InternalAspNetCoreSdkPackageVersion>2.1.0-rtm-15783</InternalAspNetCoreSdkPackageVersion>
8+
<MicrosoftAspNetCoreAllPackageVersion>2.1.0-rtm-30700</MicrosoftAspNetCoreAllPackageVersion>
9+
<MicrosoftAspNetCoreAppPackageVersion>2.1.0-rtm-30700</MicrosoftAspNetCoreAppPackageVersion>
10+
<MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion>2.1.0-rtm-30700</MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion>
11+
<MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion>2.1.0-rtm-30700</MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion>
12+
<MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>2.1.0-rtm-30700</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>
13+
<MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion>2.1.0-rtm-30700</MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion>
14+
<MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>2.1.0-rtm-30700</MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion>
15+
<MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>2.1.0-rtm-30700</MicrosoftAspNetCoreCertificatesGenerationSourcesPackageVersion>
16+
<MicrosoftAspNetCoreCookiePolicyPackageVersion>2.1.0-rtm-30700</MicrosoftAspNetCoreCookiePolicyPackageVersion>
17+
<MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>2.1.0-rtm-30700</MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>
18+
<MicrosoftAspNetCoreHttpsPolicyPackageVersion>2.1.0-rtm-30700</MicrosoftAspNetCoreHttpsPolicyPackageVersion>
19+
<MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>2.1.0-rtm-30700</MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>
20+
<MicrosoftAspNetCoreIdentityUIPackageVersion>2.1.0-rtm-30700</MicrosoftAspNetCoreIdentityUIPackageVersion>
21+
<MicrosoftAspNetCoreMvcPackageVersion>2.1.0-rtm-30700</MicrosoftAspNetCoreMvcPackageVersion>
22+
<MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion>2.1.0-rtm-30700</MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion>
23+
<MicrosoftAspNetCorePackageVersion>2.1.0-rtm-30700</MicrosoftAspNetCorePackageVersion>
24+
<MicrosoftAspNetCoreSpaServicesExtensionsPackageVersion>2.1.0-rtm-30700</MicrosoftAspNetCoreSpaServicesExtensionsPackageVersion>
25+
<MicrosoftAspNetCoreSpaServicesPackageVersion>2.1.0-rtm-30700</MicrosoftAspNetCoreSpaServicesPackageVersion>
26+
<MicrosoftAspNetCoreStaticFilesPackageVersion>2.1.0-rtm-30700</MicrosoftAspNetCoreStaticFilesPackageVersion>
27+
<MicrosoftAspNetCoreTestingPackageVersion>2.1.0-rtm-30700</MicrosoftAspNetCoreTestingPackageVersion>
2828
<MicrosoftBuildFrameworkPackageVersion>15.6.82</MicrosoftBuildFrameworkPackageVersion>
2929
<MicrosoftBuildUtilitiesCorePackageVersion>15.6.82</MicrosoftBuildUtilitiesCorePackageVersion>
30-
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>2.1.0-rc1-30677</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
31-
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.1.0-rc1-30677</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
32-
<MicrosoftEntityFrameworkCoreToolsPackageVersion>2.1.0-rc1-30677</MicrosoftEntityFrameworkCoreToolsPackageVersion>
33-
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>2.1.0-rc1-30677</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
34-
<MicrosoftExtensionsProcessSourcesPackageVersion>2.1.0-rc1-30677</MicrosoftExtensionsProcessSourcesPackageVersion>
30+
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>2.1.0-rtm-30700</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
31+
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.1.0-rtm-30700</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
32+
<MicrosoftEntityFrameworkCoreToolsPackageVersion>2.1.0-rtm-30700</MicrosoftEntityFrameworkCoreToolsPackageVersion>
33+
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>2.1.0-rtm-30700</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
34+
<MicrosoftExtensionsProcessSourcesPackageVersion>2.1.0-rtm-30700</MicrosoftExtensionsProcessSourcesPackageVersion>
3535
<MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion>
3636
<MicrosoftNETCoreApp21PackageVersion>2.1.0-rc1-26423-06</MicrosoftNETCoreApp21PackageVersion>
37-
<MicrosoftNETSdkRazorPackageVersion>2.1.0-rc1-30677</MicrosoftNETSdkRazorPackageVersion>
37+
<MicrosoftNETSdkRazorPackageVersion>2.1.0-rtm-30700</MicrosoftNETSdkRazorPackageVersion>
3838
<MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
39-
<MicrosoftVisualStudioWebBrowserLinkPackageVersion>2.1.0-rc1-30677</MicrosoftVisualStudioWebBrowserLinkPackageVersion>
40-
<MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion>2.1.0-rc1-30677</MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion>
39+
<MicrosoftVisualStudioWebBrowserLinkPackageVersion>2.1.0-rtm-30700</MicrosoftVisualStudioWebBrowserLinkPackageVersion>
40+
<MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion>2.1.0-rtm-30700</MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion>
4141
<NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
4242
<SeleniumFirefoxWebDriverPackageVersion>0.19.0</SeleniumFirefoxWebDriverPackageVersion>
4343
<SeleniumSupportPackageVersion>3.7.0</SeleniumSupportPackageVersion>

‎build/repo.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PropertyGroup>
55
<!-- These properties are use by the automation that updates dependencies.props -->
66
<LineupPackageId>Internal.AspNetCore.Universe.Lineup</LineupPackageId>
7-
<LineupPackageVersion>2.1.0-rc1-*</LineupPackageVersion>
7+
<LineupPackageVersion>2.1.0-rtm-*</LineupPackageVersion>
88
<LineupPackageRestoreSource>https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json</LineupPackageRestoreSource>
99
</PropertyGroup>
1010

‎korebuild-lock.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version:2.1.0-rtm-15776
2-
commithash:2a0c826e10e15decc8878a6b9b9f31543712ba6f
1+
version:2.1.0-rtm-15783
2+
commithash:5fc2b2f607f542a2ffde11c19825e786fc1a3774

‎src/Microsoft.DotNet.Web.ProjectTemplates/EmptyWeb-FSharp.fsproj.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
1414
<PackageReference Include="Microsoft.AspNetCore.App" />
1515
</ItemGroup>
16-
1716
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
1817
<PackageReference Include="Microsoft.AspNetCore" Version="${MicrosoftAspNetCorePackageVersion}" />
1918
</ItemGroup>

‎src/Microsoft.DotNet.Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' != 'True'">0</WebProject_DirectoryAccessLevelKey>
99
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' == 'True'">1</WebProject_DirectoryAccessLevelKey>
1010
</PropertyGroup>
11+
<!--#if (IndividualLocalAuth && !UseLocalDB) -->
1112

13+
<!--#endif -->
1214
<ItemGroup Condition=" '$(IndividualLocalAuth)' == 'True' AND '$(UseLocalDB)' != 'True' ">
1315
<None Update="app.db" CopyToOutputDirectory="PreserveNewest" />
1416
</ItemGroup>
@@ -21,7 +23,6 @@
2123
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="${MicrosoftVisualStudioWebBrowserLinkPackageVersion}" Condition="'$(UseBrowserLink)' == 'True'" />
2224
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="${MicrosoftVisualStudioWebCodeGenerationDesignPackageVersion}" PrivateAssets="All" Condition="'$(IndividualAuth)' == 'True'" />
2325
</ItemGroup>
24-
2526
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
2627
<PackageReference Include="Microsoft.AspNetCore" Version="${MicrosoftAspNetCorePackageVersion}" />
2728
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion}" Condition="'$(OrganizationalAuth)' == 'True'" />

‎src/Microsoft.DotNet.Web.ProjectTemplates/StarterWeb-CSharp.csproj.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' != 'True'">0</WebProject_DirectoryAccessLevelKey>
99
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' == 'True'">1</WebProject_DirectoryAccessLevelKey>
1010
</PropertyGroup>
11-
<!--#if (IndividualLocalAuth && UseLocalDB) -->
11+
<!--#if (IndividualLocalAuth && !UseLocalDB) -->
1212

1313
<!--#endif -->
1414
<ItemGroup Condition=" '$(IndividualLocalAuth)' == 'True' AND '$(UseLocalDB)' != 'True' ">

0 commit comments

Comments
 (0)