Skip to content

Commit 4acee8d

Browse files
committed
A few more fixes
1 parent 1e5a9cf commit 4acee8d

File tree

5 files changed

+8
-14
lines changed

5 files changed

+8
-14
lines changed

eng/Build.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@
152152
$(RepoRoot)src\Framework\App.Ref.Internal\src\Microsoft.AspNetCore.App.Ref.Internal.csproj;
153153
$(RepoRoot)src\Framework\AspNetCoreAnalyzers\test\Microsoft.AspNetCore.App.Analyzers.Test.csproj;
154154
$(RepoRoot)src\Framework\test\Microsoft.AspNetCore.App.UnitTests.csproj;
155+
$(RepoRoot)src\Assets\**\*.*proj;
155156
$(RepoRoot)src\Caching\**\*.*proj;
156157
$(RepoRoot)src\DefaultBuilder\**\*.*proj;
157158
$(RepoRoot)src\Features\JsonPatch\**\*.*proj;
@@ -200,6 +201,7 @@
200201
$(RepoRoot)**\obj\**\*;"
201202
Condition=" '$(BuildMainlyReferenceProviders)' != 'true' " />
202203
<DotNetProjects Include="
204+
$(RepoRoot)src\Assets\**\*.*proj;
203205
$(RepoRoot)src\Caching\**\src\*.csproj;
204206
$(RepoRoot)src\DefaultBuilder\**\src\*.csproj;
205207
$(RepoRoot)src\Features\JsonPatch\**\src\*.csproj;

eng/tools/GenerateFiles/Directory.Build.targets.in

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,6 @@
4444
TargetFramework="${DefaultNetCoreTargetFramework}"
4545
Condition="'@(KnownAspNetCorePack->Count())' != '0' AND
4646
!(@(KnownAspNetCorePack->AnyHaveMetadataValue('TargetFramework', '${DefaultNetCoreTargetFramework}')))" />
47-
<!-- Temporary hack until the package is made available via the SDK -->
48-
<KnownAspNetCorePack
49-
Include="Microsoft.AspNetCore.Assets.Pack"
50-
TargetFramework="${DefaultNetCoreTargetFramework}"
51-
Condition="'${DefaultNetCoreTargetFramework}' == 'net10.0' AND '@(KnownAspNetCorePack->Count())' == '0'" />
5247
</ItemGroup>
5348

5449
<ItemGroup>
@@ -107,7 +102,7 @@
107102

108103
<KnownAspNetCorePack Update="Microsoft.AspNetCore.Assets.Pack">
109104
<AspNetCorePackVersion
110-
Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRuntimeVersion}</AspNetCorePackVersion>
105+
Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftAspNetCoreAppRuntimeVersion}</AspNetCorePackVersion>
111106
</KnownAspNetCorePack>
112107

113108
<KnownCrossgen2Pack Update="Microsoft.NETCore.App.Crossgen2" Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">

src/Assets/Pack/Microsoft.AspNetCore.Assets.Pack.csproj renamed to src/Assets/Pack/Microsoft.AspNetCore.Assets.Pack.proj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,4 +142,7 @@
142142

143143
</Target>
144144

145+
<Target Name="CreateManifestResourceNames" />
146+
<Target Name="CoreCompile" />
147+
145148
</Project>

src/Components/test/testassets/Components.TestServer/RazorComponents/App.razor

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,3 @@
124124
</script>
125125
</body>
126126
</html>
127-
128-
@code {
129-
protected override void OnInitialized()
130-
{
131-
_ = 0;
132-
}
133-
}

src/Components/test/testassets/Directory.Build.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<ProjectReference Include="$(RepoRoot)src\Assets\Pack\Microsoft.AspNetCore.Assets.Pack.csproj" ReferenceOutputAssembly="false" />
17+
<!-- Temporary: Remove after package is provided by the SDK -->
18+
<ProjectReference Include="$(RepoRoot)src\Assets\Pack\Microsoft.AspNetCore.Assets.Pack.proj" ReferenceOutputAssembly="false" />
1819
</ItemGroup>
1920

2021
<ItemGroup>

0 commit comments

Comments
 (0)