Skip to content

Commit 6c99c1b

Browse files
prochan2prochan2
committedDec 12, 2019
PostSharp.Samples.MiniProfiler and PostSharp.Samples.SessionState fixed.
1 parent 43c8c52 commit 6c99c1b

File tree

6 files changed

+53
-56
lines changed

6 files changed

+53
-56
lines changed
 

‎Framework/PostSharp.Samples.MiniProfiler/PostSharp.Samples.MiniProfiler.csproj

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="..\..\packages\PostSharp.6.4.4\build\PostSharp.props" Condition="Exists('..\..\packages\PostSharp.6.4.4\build\PostSharp.props')" />
4-
<Import Project="..\..\packages\Microsoft.Net.Compilers.3.4.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\..\packages\Microsoft.Net.Compilers.3.4.0\build\Microsoft.Net.Compilers.props')" />
4+
<Import Project="..\..\packages\Microsoft.Net.Compilers.3.3.1\build\Microsoft.Net.Compilers.props" Condition="Exists('..\..\packages\Microsoft.Net.Compilers.3.3.1\build\Microsoft.Net.Compilers.props')" />
55
<Import Project="..\..\packages\EntityFramework.6.4.0\build\EntityFramework.props" Condition="Exists('..\..\packages\EntityFramework.6.4.0\build\EntityFramework.props')" />
66
<Import Project="..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
77
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props')" />
@@ -239,28 +239,28 @@
239239
<Content Include="favicon.ico" />
240240
<Content Include="Global.asax" />
241241
<Content Include="Content\Site.css" />
242-
<None Include="Content\bootstrap-grid.css.map" />
243-
<None Include="Content\bootstrap-grid.min.css.map" />
244-
<None Include="Content\bootstrap-reboot.css.map" />
245-
<None Include="Content\bootstrap-reboot.min.css.map" />
246-
<None Include="Content\bootstrap.css.map" />
247-
<None Include="Content\bootstrap.min.css.map" />
242+
<Content Include="Content\bootstrap.min.css.map" />
243+
<Content Include="Content\bootstrap.css.map" />
244+
<Content Include="Content\bootstrap-reboot.min.css.map" />
245+
<Content Include="Content\bootstrap-reboot.css.map" />
246+
<Content Include="Content\bootstrap-grid.min.css.map" />
247+
<Content Include="Content\bootstrap-grid.css.map" />
248248
<None Include="README.md" />
249-
<None Include="Scripts\bootstrap.bundle.js.map" />
250-
<None Include="Scripts\bootstrap.bundle.min.js.map" />
251-
<None Include="Scripts\bootstrap.js.map" />
252-
<None Include="Scripts\bootstrap.min.js.map" />
249+
<Content Include="Scripts\bootstrap.bundle.js" />
250+
<Content Include="Scripts\bootstrap.bundle.min.js" />
251+
<Content Include="Scripts\bootstrap.js" />
252+
<Content Include="Scripts\bootstrap.min.js" />
253+
<Content Include="Scripts\bootstrap.min.js.map" />
254+
<Content Include="Scripts\bootstrap.js.map" />
255+
<Content Include="Scripts\bootstrap.bundle.min.js.map" />
256+
<Content Include="Scripts\bootstrap.bundle.js.map" />
253257
<None Include="Scripts\esm\popper-utils.js.map" />
254258
<None Include="Scripts\esm\popper-utils.min.js.map" />
255259
<None Include="Scripts\esm\popper.js.map" />
256260
<None Include="Scripts\esm\popper.min.js.map" />
257261
<None Include="Scripts\index.js.flow" />
258262
<None Include="Scripts\jquery-1.10.2.intellisense.js" />
259263
<None Include="Scripts\jquery-3.4.1.intellisense.js" />
260-
<Content Include="Scripts\bootstrap.bundle.js" />
261-
<Content Include="Scripts\bootstrap.bundle.min.js" />
262-
<Content Include="Scripts\bootstrap.js" />
263-
<Content Include="Scripts\bootstrap.min.js" />
264264
<Content Include="Scripts\esm\popper-utils.js" />
265265
<Content Include="Scripts\esm\popper-utils.min.js" />
266266
<Content Include="Scripts\esm\popper.js" />
@@ -445,7 +445,7 @@
445445
<Error Condition="!Exists('..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
446446
<Error Condition="!Exists('..\..\packages\EntityFramework.6.4.0\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\EntityFramework.6.4.0\build\EntityFramework.props'))" />
447447
<Error Condition="!Exists('..\..\packages\EntityFramework.6.4.0\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\EntityFramework.6.4.0\build\EntityFramework.targets'))" />
448-
<Error Condition="!Exists('..\..\packages\Microsoft.Net.Compilers.3.4.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Net.Compilers.3.4.0\build\Microsoft.Net.Compilers.props'))" />
448+
<Error Condition="!Exists('..\..\packages\Microsoft.Net.Compilers.3.3.1\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Net.Compilers.3.3.1\build\Microsoft.Net.Compilers.props'))" />
449449
<Error Condition="!Exists('..\..\packages\PostSharp.6.4.4\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.6.4.4\build\PostSharp.props'))" />
450450
<Error Condition="!Exists('..\..\packages\PostSharp.6.4.4\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.6.4.4\build\PostSharp.targets'))" />
451451
</Target>

‎Framework/PostSharp.Samples.MiniProfiler/Views/Shared/_Layout.cshtml

+26-29
Original file line numberDiff line numberDiff line change
@@ -10,37 +10,34 @@
1010

1111
</head>
1212
<body>
13-
<div class="navbar navbar-inverse navbar-fixed-top">
14-
<div class="container">
15-
<div class="navbar-header">
16-
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
17-
<span class="icon-bar"></span>
18-
<span class="icon-bar"></span>
19-
<span class="icon-bar"></span>
20-
</button>
21-
@Html.ActionLink("Application name", "Index", "Home", new {area = ""}, new {@class = "navbar-brand"})
22-
</div>
23-
<div class="navbar-collapse collapse">
24-
<ul class="nav navbar-nav">
25-
<li>@Html.ActionLink("Home", "Index", "Home")</li>
26-
<li>@Html.ActionLink("About", "About", "Home")</li>
27-
<li>@Html.ActionLink("Contact", "Contact", "Home")</li>
28-
</ul>
29-
@Html.Partial("_LoginPartial")
13+
<nav class="navbar navbar-expand-sm navbar-dark fixed-top bg-dark">
14+
<div class="container">
15+
<div class="navbar-header">
16+
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"></button>
17+
@Html.ActionLink("PostSharp.Samples.MiniProfiler", "Index", "Home", new { area = "" }, new { @class = "navbar-brand" })
18+
</div>
19+
<div class="navbar-collapse collapse" id="navbarSupportedContent">
20+
<ul class="nav navbar-nav mr-auto">
21+
<li class="nav-item">@Html.ActionLink("Home", "Index", "Home", null, new { @class = "nav-link" })</li>
22+
<li class="nav-item">@Html.ActionLink("About", "About", "Home", null, new { @class = "nav-link" })</li>
23+
<li class="nav-item">@Html.ActionLink("Contact", "Contact", "Home", null, new { @class = "nav-link" })</li>
24+
</ul>
25+
@Html.Partial("_LoginPartial")
26+
</div>
3027
</div>
28+
</nav>
29+
<div class="container body-content">
30+
@RenderBody()
31+
<hr />
32+
<footer>
33+
<p>&copy; @DateTime.Now.Year - My ASP.NET Application</p>
34+
</footer>
3135
</div>
32-
</div>
33-
<div class="container body-content">
34-
@RenderBody()
35-
<hr/>
36-
<footer>
37-
<p>&copy; @DateTime.Now.Year - My ASP.NET Application</p>
38-
</footer>
39-
</div>
4036

41-
@Scripts.Render("~/bundles/jquery")
42-
@Scripts.Render("~/bundles/bootstrap")
43-
@RenderSection("scripts", false)
44-
@MiniProfiler.RenderIncludes()
37+
@MiniProfiler.Current.RenderIncludes()
38+
39+
@Scripts.Render("~/bundles/jquery")
40+
@Scripts.Render("~/bundles/bootstrap")
41+
@RenderSection("scripts", false)
4542
</body>
4643
</html>

‎Framework/PostSharp.Samples.MiniProfiler/Views/Shared/_LoginPartial.cshtml

+7-7
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55
{
66
@Html.AntiForgeryToken()
77

8-
<ul class="nav navbar-nav navbar-right">
9-
<li>
8+
<ul class="nav navbar-nav navbar-right mr-auto">
9+
<li class="nav-item">
1010
@Html.ActionLink("Hello " + User.Identity.GetUserName() + "!", "Index", "Manage", null, new {title = "Manage"})
1111
</li>
12-
<li>
12+
<li class="nav-item">
1313
<a href="javascript:document.getElementById('logoutForm').submit()">Log off</a>
1414
</li>
1515
</ul>
1616
}
1717
}
1818
else
1919
{
20-
<ul class="nav navbar-nav navbar-right">
21-
<li>@Html.ActionLink("Register", "Register", "Account", null, new {id = "registerLink"})</li>
22-
<li>@Html.ActionLink("Log in", "Login", "Account", null, new {id = "loginLink"})</li>
23-
</ul>
20+
<ul class="nav navbar-nav navbar-right mr-auto">
21+
<li class="nav-item">@Html.ActionLink("Register", "Register", "Account", null, new { id = "registerLink", @class = "nav-link" })</li>
22+
<li class="nav-item">@Html.ActionLink("Log in", "Login", "Account", null, new { id = "loginLink", @class = "nav-link" })</li>
23+
</ul>
2424
}

‎Framework/PostSharp.Samples.MiniProfiler/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net472" />
1616
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="3.1.0" targetFramework="net472" />
1717
<package id="Microsoft.jQuery.Unobtrusive.Validation" version="3.2.11" targetFramework="net472" />
18-
<package id="Microsoft.Net.Compilers" version="3.4.0" targetFramework="net472" developmentDependency="true" />
18+
<package id="Microsoft.Net.Compilers" version="3.3.1" targetFramework="net472" developmentDependency="true" />
1919
<package id="Microsoft.Owin" version="4.1.0" targetFramework="net472" />
2020
<package id="Microsoft.Owin.Host.SystemWeb" version="4.1.0" targetFramework="net472" />
2121
<package id="Microsoft.Owin.Security" version="4.1.0" targetFramework="net472" />

‎Framework/PostSharp.Samples.SessionState/PostSharp.Samples.SessionState.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="..\..\packages\PostSharp.6.4.4\build\PostSharp.props" Condition="Exists('..\..\packages\PostSharp.6.4.4\build\PostSharp.props')" />
4-
<Import Project="..\..\packages\Microsoft.Net.Compilers.3.4.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\..\packages\Microsoft.Net.Compilers.3.4.0\build\Microsoft.Net.Compilers.props')" />
4+
<Import Project="..\..\packages\Microsoft.Net.Compilers.3.3.1\build\Microsoft.Net.Compilers.props" Condition="Exists('..\..\packages\Microsoft.Net.Compilers.3.3.1\build\Microsoft.Net.Compilers.props')" />
55
<Import Project="..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
66
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
77
<PropertyGroup>
@@ -124,7 +124,7 @@
124124
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
125125
</PropertyGroup>
126126
<Error Condition="!Exists('..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
127-
<Error Condition="!Exists('..\..\packages\Microsoft.Net.Compilers.3.4.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Net.Compilers.3.4.0\build\Microsoft.Net.Compilers.props'))" />
127+
<Error Condition="!Exists('..\..\packages\Microsoft.Net.Compilers.3.3.1\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Net.Compilers.3.3.1\build\Microsoft.Net.Compilers.props'))" />
128128
<Error Condition="!Exists('..\..\packages\PostSharp.6.4.4\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.6.4.4\build\PostSharp.props'))" />
129129
<Error Condition="!Exists('..\..\packages\PostSharp.6.4.4\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.6.4.4\build\PostSharp.targets'))" />
130130
</Target>

‎Framework/PostSharp.Samples.SessionState/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net472" />
4-
<package id="Microsoft.Net.Compilers" version="3.4.0" targetFramework="net472" developmentDependency="true" />
4+
<package id="Microsoft.Net.Compilers" version="3.3.1" targetFramework="net472" developmentDependency="true" />
55
<package id="PostSharp" version="6.4.4" targetFramework="net472" developmentDependency="true" />
66
<package id="PostSharp.Redist" version="6.4.4" targetFramework="net472" />
77
</packages>

0 commit comments

Comments
 (0)
Please sign in to comment.